From owner-man-jp-reviewer@jp.FreeBSD.org Mon Nov 27 23:36:26 2006
Received: (from daemon@localhost)
	by castle.jp.FreeBSD.org (8.11.6p2+3.4W/8.11.3) id kAREaQs49354;
	Mon, 27 Nov 2006 23:36:26 +0900 (JST)
	(envelope-from owner-man-jp-reviewer@jp.FreeBSD.org)
Received: from mail.asahi-net.or.jp (mail1.asahi-net.or.jp [202.224.39.197])
	by castle.jp.FreeBSD.org (8.11.6p2+3.4W/8.11.3) with ESMTP/inet id kAREaPw49337
	for <man-jp-reviewer@jp.FreeBSD.org>; Mon, 27 Nov 2006 23:36:25 +0900 (JST)
	(envelope-from CQG00620@nifty.ne.jp)
Received: from asahi-net.jp (h204032.ppp.asahi-net.or.jp [61.114.204.32])
	by mail.asahi-net.or.jp (Postfix) with ESMTP id CEDEE191F6
	for <man-jp-reviewer@jp.FreeBSD.org>; Mon, 27 Nov 2006 23:36:23 +0900 (JST)
From: Watanabe Kazuhiro <CQG00620@nifty.ne.jp>
To: jpman reviewer <man-jp-reviewer@jp.FreeBSD.org>
User-Agent: Wanderlust/2.14.0 (Africa) SEMI/1.14.6 (Maruoka) FLIM/1.14.8
 (=?ISO-8859-4?Q?Shij=F2?=) APEL/10.6 Emacs/20.7 (i386--freebsd) MULE/4.0
 (HANANOEN)
MIME-Version: 1.0 (generated by SEMI 1.14.6 - "Maruoka")
Content-Type: multipart/mixed;
 boundary="Multipart_Mon_Nov_27_23:34:59_2006-1"
Content-Transfer-Encoding: 7bit
Message-Id: <20061127143623.CEDEE191F6@mail.asahi-net.or.jp>
Reply-To: man-jp-reviewer@jp.FreeBSD.org
Precedence: list
Date: Mon, 27 Nov 2006 23:35:03 +0900
X-Sequence: man-jp-reviewer 5160
Subject: [man-jp-reviewer 5160] (OpenSSH) Update to 6.2-RC1
Sender: owner-man-jp-reviewer@jp.FreeBSD.org
X-Originator: CQG00620@nifty.ne.jp
X-Distribute: distribute version 2.1 (Alpha) patchlevel 24e+060209

--Multipart_Mon_Nov_27_23:34:59_2006-1
Content-Type: text/plain; charset=ISO-2022-JP

$BEOJU0l42$G$9!#(B

6.2-RC1 $B$G(B OpenSSH 4.5p1 $B$,:NMQ$5$l$^$7$?!#(B

ftp://ftp.freebsd.org/pub/FreeBSD/releases/i386/6.2-RC1/RELNOTES.HTM#CONTRIB

$B?7;3M42p$5$s$b(B 4.5p1 $BMQ$NF|K\8l%^%K%e%"%k$r8x3+$7$F$$$^$9!#(B

http://www.unixuser.org/~euske/doc/openssh/jman/

$B$=$3$G(B OpenSSH 4.5p1 $B$N%*%j%8%J%k(B($B1QJ8(B)$B$N%^%K%e%"%k$H!"(BFreeBSD $B$K%3%s(B
$B%H%j%S%e!<%H$5$l$?(B 4.5p1 $B$N%^%K%e%"%k$N:9J,$r<h$C$F!"?7;3$5$s$N%^%K%e(B
$B%"%k$KE,MQ$7$F$_$^$7$?!#(B

$B$J$*?7;3$5$s$OF|K\8lLu$K<+?H$N%/%l%8%C%H$rF~$l$J$/$J$C$?$h$&$J$N$G!"(B
jpman$B$N%/%l%8%C%H(B($BO"Mm@h(B)$B$b>/$7JQ$($J$$$H$$$1$J$$$G$7$g$&(B ($B$N$G!"$^$@(B
$BF~$l$F$^$;$s(B)$B!#!V(Bjpman$B$K%3%s%?%/%H$7$F$b$i$($P!"?7;3$5$s$KDI$C$FO"Mm$9(B
$B$k!W$N$h$&$J46$8$GNI$$$H;W$$$^$9$,!#(B

*****

$BBP>]$N%U%!%$%k$O<!$NDL$j!#%*%j%8%J%k(B($B1QJ8(B)$B$N%^%K%e%"%k$K$O0lIt%j%S%8%g(B
$B%s$,JQ$o$C$F$$$J$$$b$N$,$"$j$^$9$,!"F|K\8lLu$O$9$Y$F%j%S%8%g%s$,>e$,$C(B
$B$F$*$j!"$^$?Lu$N7A<0$NLdBj$b$"$k$N$G!"A4It:9$7BX$($?$[$&$,NI$$$H;W$$$^(B
$B$9!#(B

scp.1		    ($B%3%^%s%I%i%$%s%*%W%7%g%s2r@b$N=gHV$N=$@5(B)
sftp-server.8	    ($B%;%/%7%g%s$N=gHV$N=$@5(B)
sftp.1
ssh-add.1
ssh-agent.1
ssh-keygen.1	    ($B%3%^%s%I%i%$%s%*%W%7%g%s2r@b$N=gHV$N=$@5(B)
ssh-keyscan.1	    (-T $B%3%^%s%I%i%$%s%*%W%7%g%s$N0z?t$NH4$1$N=$@5(B)
ssh-keysign.8	    (.Sh $B%U%!%$%k(B -> .Sh $B4XO"%U%!%$%k(B)
ssh.1		(*)
ssh_config.5	(*)
sshd.8		(*) ($B%Q%i%0%i%U$NH4$1$N=$@5(B)
sshd_config.5	(*)

RCS ID$B$NDI2C0J30$N!"(BFreeBSD$B8GM-$NJQ99$,I,MW$J$N$O(B (*) $B0u$N$"$k$b$N$@$1(B
$B$G$9$,!"0u$N$J$$$b$N$b4^$a$F!"2?$i$+$N=$@5$rF~$l$F$$$^$9!#<g$J=$@5E@$O(B
$B>e$K5s$2$?DL$j$G$9$,!"$=$l0J30$KLu8l$NMI$l$r=$@5$9$k$?$a!"(B

$B$5$$(B			-> $B:](B
$B$D$+$C$?(B/$B$D$+$C$F(B	-> $B;H$C$?(B/$B;H$C$F(B
$BFI$_$3$_(B/$BFI$_$3$a(B	-> $BFI$_9~$_(B/$BFI$_9~$a(B
$B$H$j=|$-(B		-> $B<h$j=|$-(B

$B$N$h$&$KLu8l$rE}0l$7$^$7$?!#$^$?(Bjpman$B8GM-$N$b$N$H$7$F$O(B

.Sh $BL>A0(B		-> .Sh $BL>>N(B
.Sh $B@bL@(B		-> .Sh $B2r@b(B
$B%+%s%^(B			-> $B%3%s%^(B
$B%$%s%?!<%U%'%$%9(B	-> $B%$%s%?%U%'!<%9(B
$B%&%$%s%I%&(B		-> $B%&%#%s%I%&(B
$B%9!<%Q!<(B		-> $B%9!<%Q(B
$B%<%m(B			-> 0

$B$N$h$&$KLu8l$rJQ99$7!"9TKv$NM>J,$J6uGr$r:o=|$7$^$7$?!#(B

$B$3$l$i0J30$K$b!"(Bjpman$B%W%m%8%'%/%H$G99?7$7$F$$$?3F%U%!%$%k$b;29M$K!";((B
$BB?$J=$@5$r9T$C$F$$$^$9!#$[$H$s$I$O(B1$B%P%$%HJ8;zNsN>C<$N6uGr$ND4@0$G$9$,!"(B
$B0U?^E*$KF~$l$F$"$k$H;W$o$l$k9TCf$N6uGr$OFC$K:o=|$7$F$$$^$;$s!#(B

FreeBSD$B$*$h$S(Bjpman$B8GM-$NJQ990J30$N=$@5E@$O!"?7;3$5$s$K:9J,$rAwIU$9$kM=(B
$BDj$G$9!#(B

*****

sftp(1)$B$N(Bln$B$*$h$S(Bsymlink$B%3%^%s%I$NLu$K$O7Z$$0cOB46$r46$8$^$9!#(B

| .It Ic symlink Ar oldpath Ar newpath
| Create a symbolic link from
| .Ar oldpath
| to
| .Ar newpath .

$B$H$$$&86J8$r?7;3$5$s$O(B

| .It Ic symlink Ar $B8E$$%Q%9L>(B Ar $B?7$7$$%Q%9L>(B
| .Ar $B?7$7$$%Q%9L>(B
| $B$+$i(B
| .Ar $B8E$$%Q%9L>(B
| $B$X$N%7%s%\%j%C%/%j%s%/$r:n@.$7$^$9!#(B

$B$HLu$7$F$$$^$9!#>.6b4]$5$s$O(B6.0-RELEASE$B8~$1$N=$@5$G(B

| .It Ic symlink Ar oldpath Ar newpath
| .Ar oldpath
| ($B8E$$%Q%9L>(B) $B$+$i(B
| .Ar newpath
| ($B?7$7$$%Q%9L>(B) $B$X$N%7%s%\%j%C%/%j%s%/$r:n@.$7$^$9!#(B

$B$H$7$F$$$^$9!#;d$,Lu$9$H$7$F$b>.6b4]$5$s$N$h$&$K$9$k$H;W$$$^$9!#(B
$B$?$@$7JQ99$9$k$H$J$k$H!"8l=g$,$^$C$?$/5U$J$N$G!">/$7m4m0$7$^$9$M!#(B
$B$=$l$H!"(B

$ touch file1
$ ln -s file1 file2
$ ls -l file1 file2
-rw-r--r--  1 nabe  nabe  0 Nov 27 20:38 file1
lrwxr-xr-x  1 nabe  nabe  3 Nov 27 20:38 file2 -> file1
$

$B$N$h$&$KA`:n$7$F$_$k$H!"?7;3$5$s$NLu$N$[$&$,$7$C$/$j$/$k$h$&$J(B
$B5$$b$7$^$9!#(B

$B$b$&$3$l$OLu$,$I$&$N$H$$$&$h$j$O86J8$,NI$/$J$$$h$&$J5$$,$7$^$9!#(B
$B$$$C$=(Bln(1)$B$+$i0zMQ$7$F!"(B

$B!V%j%s%/@h%U%!%$%k$NL>A0$H$7$F(B file1 $B$rJ];}$9$k%7%s%\%j%C%/%j%s%/(B 
  file2 $B$r:n@.$7$^$9!W(B

$B0L$N0ULu$K$7$F$7$^$$$^$7$g$&$+!#(B


$B%*%j%8%J%k(B($B1QJ8(B)$B$N(Bdiff$B$b$D$1$^$9!#(B

--- scp.1.orig	Fri Oct  6 10:15:25 2006
+++ scp.1	Mon Nov 27 22:56:44 2006
@@ -14,10 +14,13 @@
 .\" Japanese translation: $Id: scp.1,v 1.10 2006/04/17 04:27:52 yusuke Exp $
 .\" by Yusuke Shinyama <yusuke @ cs . nyu . edu>
 .\"
+.\" %FreeBSD%
+.\" $FreeBSD$
+.\"
 .Dd September 25, 1999
 .Dt SCP 1
 .Os
-.Sh $BL>A0(B
+.Sh $BL>>N(B
 .Nm scp
 .Nd $B0BA4$J%U%!%$%k%3%T!<(B ($B%j%b!<%H(B $B%U%!%$%k%3%T!<(B $B%W%m%0%i%`(B)
 .Sh $B=q<0(B
@@ -45,10 +48,10 @@
 .Oc Ar $B%U%!%$%k(B2
 .Sm on
 .Ek
-.Sh $B@bL@(B
+.Sh $B2r@b(B
 .Nm
 $B$O%M%C%H%o!<%/>e$N%[%9%H4V$G%U%!%$%k$r%3%T!<$7$^$9!#(B
-$B$3$l$O%G!<%?E>Aw$K(B 
+$B$3$l$O%G!<%?E>Aw$K(B
 .Xr ssh 1
 $B$r;H$$!"$3$l$HF1MM$NG'>Z$r$*$3$J$$$^$9!#$3$l$K$h$C$F!"(B
 .Xr ssh 1
@@ -60,7 +63,7 @@
 .Pp
 $B3F%U%!%$%kL>$K$O!"%[%9%H$*$h$S%f!<%6$N;XDj$r4^$a$k$3$H$,$G$-$^$9!#$3$l$O(B
 $B$=$N%U%!%$%k$,$I$N%[%9%H$+$i!"$"$k$$$O$I$N%[%9%H$K%3%T!<$5$l$k$+$r(B
-$B;XDj$9$k$b$N$G$9!#(B2$B$D$N%j%b!<%H%[%9%H4V$G%U%!%$%k%3%T!<$9$k$3$H$b$G$-$^$9!#(B
+$B;XDj$9$k$b$N$G$9!#(B2 $B$D$N%j%b!<%H%[%9%H4V$G%U%!%$%k%3%T!<$9$k$3$H$b$G$-$^$9!#(B
 .Pp
 $B%*%W%7%g%s$O<!$N$H$*$j$G$9(B:
 .Bl -tag -width Ds
@@ -76,6 +79,14 @@
 .It Fl 6
 .Nm
 $B$,(B IPv6 $B%"%I%l%9$N$_$r;H$&$h$&6/@)$7$^$9!#(B
+.It Fl B
+$B%P%C%A=hM}%b!<%I(B ($B%Q%9%o!<%I$d%Q%9%U%l!<%:$r?R$M$J$$$h$&$K$7$^$9(B)$B!#(B
+.It Fl C
+$BDL?.$r05=L$7$^$9!#(B
+.Xr ssh 1
+$B$K(B
+.Fl C
+$B%U%i%0$rEO$7$F05=L$r5v2D$7$^$9!#(B
 .It Fl c Ar $B0E9fJ}<0(B
 $B%G!<%?E>Aw$K;H$&0E9fJ}<0$rA*Br$7$^$9!#$3$N%*%W%7%g%s$OD>@\(B
 .Xr ssh 1
@@ -99,7 +110,7 @@
 $B$G;H$o$l$F$$$k7A<0$N%*%W%7%g%s$r(B
 .Nm ssh
 $B$KEO$9$?$a$K;H$$$^$9!#(B
-$B$3$l$O(B 
+$B$3$l$O(B
 .Nm scp
 $B$N%3%^%s%I%i%$%s%*%W%7%g%s$+$i$OD>@\;XDj$G$-$J$$(B
 $B9`L\$r;XDj$9$k$H$-$KJXMx$G$9!#(B
@@ -157,6 +168,15 @@
 .It UserKnownHostsFile
 .It VerifyHostKeyDNS
 .El
+.It Fl P Ar $B%]!<%HHV9f(B
+$B%j%b!<%H%[%9%H$K@\B3$9$k%]!<%HHV9f$r;XDj$7$^$9!#(B
+$B$3$N%*%W%7%g%s$OBgJ8;z$N(B
+.Sq P
+$B$G$"$k$3$H$KCm0U$7$F$/$@$5$$!#$3$l$O>.J8;z$N(B
+.Fl p
+$B$,!";~9o$d%Q!<%_%C%7%g%s$rJ]$D%*%W%7%g%s$H$7$F(B
+.Xr rcp 1
+$B$K$h$C$F$9$G$K;H$o$l$F$$$k$?$a$G$9!#(B
 .It Fl p
 $B%3%T!<85%U%!%$%k$N:G=*=$@5;~9o!":G=*%"%/%;%9;~9o!"$*$h$S(B
 $B%Q!<%_%C%7%g%s$rJ]$D$h$&$K$7$^$9!#(B
@@ -170,23 +190,6 @@
 $B$NL>A0$r;XDj$7$^$9!#$3$N%W%m%0%i%`$O(B
 .Xr ssh 1
 $B$N%*%W%7%g%s$,;HMQ$G$-$J$/$F$O$$$1$^$;$s!#(B
-.It Fl B
-$B%P%C%A=hM}%b!<%I(B ($B%Q%9%o!<%I$d%Q%9%U%l!<%:$r?R$M$J$$$h$&$K$7$^$9(B)$B!#(B
-.It Fl C
-$BDL?.$r05=L$7$^$9!#(B
-.Xr ssh 1
-$B$K(B
-.Fl C
-$B%U%i%0$rEO$7$F05=L$r5v2D$7$^$9!#(B
-.It Fl P Ar $B%]!<%HHV9f(B
-$B%j%b!<%H%[%9%H$K@\B3$9$k%]!<%HHV9f$r;XDj$7$^$9!#(B
-$B$3$N%*%W%7%g%s$OBgJ8;z$N(B
-.Sq P
-$B$G$"$k$3$H$KCm0U$7$F$/$@$5$$!#$3$l$O>.J8;z$N(B
-.Fl p
-$B$,!";~9o$d%Q!<%_%C%7%g%s$rJ]$D%*%W%7%g%s$H$7$F(B
-.Xr rcp 1
-$B$K$h$C$F$9$G$K;H$o$l$F$$$k$?$a$G$9!#(B
 .It Fl v
 $B>iD9I=<(%b!<%I!#(B
 .Nm
--- sftp-server.8.orig	Mon Oct  2 18:09:35 2006
+++ sftp-server.8	Mon Nov 27 22:56:45 2006
@@ -25,17 +25,20 @@
 .\" Japanese translation: $Id: sftp-server.8,v 1.6 2006/04/17 04:27:52 yusuke Exp $
 .\" by Yusuke Shinyama <yusuke at cs . nyu . edu>
 .\"
+.\" %FreeBSD%
+.\" $FreeBSD$
+.\"
 .Dd August 30, 2000
 .Dt SFTP-SERVER 8
 .Os
-.Sh $BL>A0(B
+.Sh $BL>>N(B
 .Nm sftp-server
 .Nd SFTP $B%5!<%P(B $B%5%V%7%9%F%`(B
 .Sh $B=q<0(B
 .Nm sftp-server
 .Op Fl f Ar $B%m%0=PNO@h(B
 .Op Fl l Ar $B%m%0%l%Y%k(B
-.Sh $B@bL@(B
+.Sh $B2r@b(B
 .Nm
 $B$O%5!<%PB&$N(B SFTP $B%W%m%H%3%k$rI8=`=PNO$K8~$+$C$FOC$7!"(B
 $B%/%i%$%"%s%HB&$NMW5a$rI8=`F~NO$+$i<u$1$D$1$^$9!#(B
@@ -66,7 +69,7 @@
 .Nm
 $B$,I=<($9$k$I$N%m%0%a%C%;!<%8$r5-O?$9$k$+$r;XDj$7$^$9!#(B
 $B;XDj$G$-$kCM$O(B:
-QUIET, FATAL, ERROR, INFO, VERBOSE, DEBUG, DEBUG1, DEBUG2, 
+QUIET, FATAL, ERROR, INFO, VERBOSE, DEBUG, DEBUG1, DEBUG2,
 $B$*$h$S(B DEBUG3 $B$N$I$l$+$G$9!#(B
 INFO $B$*$h$S(B VERBOSE $B$O(B
 .Nm
@@ -88,10 +91,10 @@
 .%D January 2001
 .%O work in progress material
 .Re
-.Sh $B:n<T(B
-.An Markus Friedl Aq markus@openbsd.org
 .Sh $BNr;K(B
 .Nm
 $B$O(B
 OpenBSD 2.8
 $B$G:G=i$KEP>l$7$^$7$?!#(B
+.Sh $B:n<T(B
+.An Markus Friedl Aq markus@openbsd.org
--- sftp.1.orig	Mon Apr 17 13:27:52 2006
+++ sftp.1	Mon Nov 27 22:56:45 2006
@@ -25,10 +25,13 @@
 .\" Japanese translation: $Id: sftp.1,v 1.13 2006/04/17 04:27:52 yusuke Exp $
 .\" by Yusuke Shinyama <yusuke at cs . nyu . edu>
 .\"
+.\" %FreeBSD%
+.\" $FreeBSD$
+.\"
 .Dd February 4, 2001
 .Dt SFTP 1
 .Os
-.Sh $BL>A0(B
+.Sh $BL>>N(B
 .Nm sftp
 .Nd $B0BA4$J%U%!%$%kE>Aw%W%m%0%i%`(B
 .Sh $B=q<0(B
@@ -59,7 +62,7 @@
 .Nm sftp
 .Fl b Ar $B%P%C%A%U%!%$%k(B
 .Oo Ar $B%f!<%6(B Ns @ Oc Ns Ar $B%[%9%HL>(B
-.Sh $B@bL@(B
+.Sh $B2r@b(B
 .Nm
 $B$O(B
 .Xr ftp 1
@@ -75,18 +78,18 @@
 .Ar $B%[%9%H(B
 $B$K@\B3$7$F%m%0%$%s$7$?$"$H!"BPOCE*$J%3%^%s%I%b!<%I$KF~$j$^$9!#(B
 .Pp
-2$BHVL\$N=q<0$G$O!"(B
+2 $BHVL\$N=q<0$G$O!"(B
 $BBPOCE*$G$J$$(B ($BLuCm(B: $B%f!<%6$,%Q%9%U%l!<%:Ey$rF~NO$9$kI,MW$N$J$$(B) $BG'>Z$,(B
 $B;H$o$l$F$$$k>l9g$K<+F0E*$K%U%!%$%k$r<hF@$7$^$9!#(B
 $B$=$&$G$J$$>l9g$OBPOCE*$JG'>Z$N$N$A$K%U%!%$%k$r<hF@$7$^$9!#(B
 .Pp
-3$BHVL\$N=q<0$O!";XDj$5$l$?%j%b!<%H%G%#%l%/%H%j$+$i(B
+3 $BHVL\$N=q<0$O!";XDj$5$l$?%j%b!<%H%G%#%l%/%H%j$+$i(B
 .Nm
 $B$r3+;O$7$^$9!#(B
 .Pp
-4$BHVL\$N=q<0$O!"(B
+4 $BHVL\$N=q<0$O!"(B
 .Fl b
-$B%*%W%7%g%s$r$D$+$C$F<+F02=$5$l$?%;%C%7%g%s$r2DG=$K$7$^$9!#(B
+$B%*%W%7%g%s$r;H$C$F<+F02=$5$l$?%;%C%7%g%s$r2DG=$K$7$^$9!#(B
 $B$3$N>l9g!"@\B3;~$K%Q%9%o!<%I$rF~NO$7$J$/$F$b$$$$$h$&$K!"BPOCE*$G$J$$(B
 $BG'>ZJ}<0$r;H$&$h$&$K@_Dj$7$F$*$/I,MW$,$"$j$^$9(B ($B>\$7$/$O(B
 .Xr sshd 8
@@ -100,7 +103,7 @@
 $B%W%m%H%3%k(B $B%P!<%8%g%s(B 1 $B$r;HMQ$7$^$9!#(B
 .It Fl B Ar $B%P%C%U%!%5%$%:(B
 .Nm
-$B$,%U%!%$%kE>Aw$r$*$3$J$&$5$$$N%P%C%U%!%5%$%:$r;XDj$7$^$9!#(B
+$B$,%U%!%$%kE>Aw$r$*$3$J$&:]$N%P%C%U%!%5%$%:$r;XDj$7$^$9!#(B
 $B%P%C%U%!$rBg$-$/$9$k$H!"1}I|(B (round trip) $B$,>/$J$/$J$j$^$9$,!"(B
 $B$=$N$V$s%a%b%j$OM>7W$K>CHq$7$^$9!#%G%U%)%k%H$NCM$O(B 32768 $B%P%$%H$G$9!#(B
 .It Fl b Ar $B%P%C%A%U%!%$%k(B
@@ -125,13 +128,13 @@
 .Ic lmkdir
 $B%3%^%s%IL>$NA0$K%W%l%U%#%C%/%9(B
 .Sq \-
-$B$r$D$1$k$3$H$G!"%(%i!<;~$N6/@)=*N;$r6X;_$9$k$3$H$,$G$-$^$9(B 
+$B$r$D$1$k$3$H$G!"%(%i!<;~$N6/@)=*N;$r6X;_$9$k$3$H$,$G$-$^$9(B
 ($BNc(B:
 .Ic -rm /tmp/blah* )$B!#(B
 .It Fl C
 $B05=L5!G=$r;HMQ2DG=$K$7$^$9(B (ssh $B$N(B
 .Fl C
-$B%U%i%0$rMxMQ$7$^$9(B)
+$B%U%i%0$rMxMQ$7$^$9(B)$B!#(B
 .It Fl F Ar ssh$B@_Dj%U%!%$%k(B
 .Xr ssh 1
 $B$KJL$N%f!<%6@_Dj%U%!%$%k$r;XDj$7$^$9!#(B
@@ -145,7 +148,7 @@
 .Nm sftp
 $B$,FHN)$7$?%3%^%s%I%i%$%s%*%W%7%g%s$r;}$C$F$$$J$$$h$&$J(B
 $B9`L\$r@_Dj$9$k$N$KJXMx$G$9!#$?$H$($P!"JL$N%]!<%H$r;HMQ$9$k$K$O(B
-.Ic sftp -oPort=24 
+.Ic sftp -oPort=24
 $B$N$h$&$K$7$^$9!#(B
 $B0J2<$N%*%W%7%g%s$N>\:Y$H!"$3$l$i$,$H$j$&$kCM$K$D$$$F$O(B
 .Xr ssh_config 5
@@ -242,7 +245,7 @@
 $B$G%(%9%1!<%W$9$kI,MW$,$"$j$^$9!#(B
 .Bl -tag -width Ds
 .It Ic bye
-.Nm sftp 
+.Nm sftp
 $B$r=*N;$7$^$9!#(B
 .It Ic cd Ar $B%Q%9L>(B
 $B%j%b!<%HB&$N%+%l%s%H%G%#%l%/%H%j$r(B
@@ -280,7 +283,7 @@
 .Ar $B%f!<%6(BID
 $B$O?tCMI=8=$G$"$kI,MW$,$"$j$^$9!#(B
 .It Ic exit
-.Nm sftp 
+.Nm sftp
 $B$r=*N;$7$^$9!#(B
 .It Xo Ic get
 .Op Fl P
@@ -333,7 +336,7 @@
 $B$X$N%7%s%\%j%C%/%j%s%/$r:n@.$7$^$9!#(B
 .It Ic lpwd
 $B%m!<%+%k%^%7%s>e$N%+%l%s%H%G%#%l%/%H%j(B
-($B%o!<%-%s%0%G%#%l%/%H%j(B) 
+($B%o!<%-%s%0%G%#%l%/%H%j(B)
 $B$rI=<($7$^$9!#(B
 .It Xo Ic ls
 .Op Fl 1aflnrSt
@@ -354,7 +357,7 @@
 $B$N$U$k$^$$$rJQ$($k$3$H$,$G$-$^$9(B:
 .Bl -tag -width Ds
 .It Fl 1
-$B=PNO$r(B 1$B%+%i%`$N$_$K$7$^$9!#(B
+$B=PNO$r(B 1 $B%+%i%`$N$_$K$7$^$9!#(B
 .It Fl a
 $B%I%C%H(B
 .Pq Sq \&.
@@ -375,7 +378,7 @@
 .El
 .It Ic lumask Ar umask
 $B%m!<%+%k%^%7%s>e$N(B umask $B$r(B
-.Ar umask 
+.Ar umask
 $B$K@_Dj$7$^$9!#(B
 .It Ic mkdir Ar $B%Q%9L>(B
 $B%j%b!<%H%^%7%s>e$K(B
@@ -405,10 +408,10 @@
 $B%"%/%;%9;~4V$b%3%T!<$5$l$^$9!#(B
 .It Ic pwd
 $B%j%b!<%H%^%7%s>e$N%+%l%s%H%G%#%l%/%H%j(B
-($B%o!<%-%s%0%G%#%l%/%H%j(B) 
+($B%o!<%-%s%0%G%#%l%/%H%j(B)
 $B$rI=<($7$^$9!#(B
 .It Ic quit
-.Nm sftp 
+.Nm sftp
 $B$r=*N;$7$^$9!#(B
 .It Ic rename Ar $B8E$$%Q%9L>(B Ar $B?7$7$$%Q%9L>(B
 $B%j%b!<%H%^%7%s>e$N(B
--- ssh-add.1.orig	Mon Apr 17 13:27:52 2006
+++ ssh-add.1	Mon Nov 27 22:56:45 2006
@@ -40,10 +40,13 @@
 .\" Japanese translation: $Id: ssh-add.1,v 1.11 2006/04/17 04:27:52 yusuke Exp $
 .\" by Yusuke Shinyama <yusuke at cs . nyu . edu>
 .\"
+.\" %FreeBSD%
+.\" $FreeBSD$
+.\"
 .Dd September 25, 1999
 .Dt SSH-ADD 1
 .Os
-.Sh $BL>A0(B
+.Sh $BL>>N(B
 .Nm ssh-add
 .Nd $BG'>Z%(!<%8%'%s%H$K(B RSA $B$"$k$$$O(B DSA $BHkL)80$rDI2C$9$k(B
 .Sh $B=q<0(B
@@ -57,14 +60,14 @@
 .Pp
 .Nm
 .Fl e Ar reader
-.Sh $B@bL@(B
+.Sh $B2r@b(B
 .Nm
 $B$OG'>Z%(!<%8%'%s%H$G$"$k(B
-.Xr ssh-agent 1 .
-$B$K!"(B RSA $B$"$k$$$O(B DSA $B$NG'>Z80$rDI2C$7$^$9!#(B
+.Xr ssh-agent 1
+$B$K!"(BRSA $B$"$k$$$O(B DSA $B$NG'>Z80$rDI2C$7$^$9!#(B
 $B0z?t$J$7$G<B9T$5$l$?>l9g!"$3$l$O(B
 .Pa ~/.ssh/id_rsa ,
-.Pa ~/.ssh/id_dsa 
+.Pa ~/.ssh/id_dsa
 $B$*$h$S(B
 .Pa ~/.ssh/identity
 $B$N3F%U%!%$%k$rDI2C$7$^$9!#%3%^%s%I%i%$%s$+$iJL$N(B
@@ -110,7 +113,7 @@
 .Ar reader
 $B$K80$rDI2C$7$^$9!#(B
 .It Fl t Ar $B80$N@8B8;~4V(B
-$B%(!<%8%'%s%H$K80$rDI2C$9$k$5$$!"$=$N80$N:GBg@8B8;~4V$r;XDj$7$^$9!#(B
+$B%(!<%8%'%s%H$K80$rDI2C$9$k:]!"$=$N80$N:GBg@8B8;~4V$r;XDj$7$^$9!#(B
 $B@8B8;~4V$OIC?t!"$"$k$$$O(B
 .Xr sshd_config 5
 $B$G;H$o$l$F$$$k7A<0$G;XDj$G$-$^$9!#(B
@@ -135,7 +138,7 @@
 $B$O(B
 .Ev SSH_ASKPASS
 $B$G;XDj$5$l$?%W%m%0%i%`$rN)$A>e$2!"%Q%9%U%l!<%:$rFI$`$?$a$N(B
-X11 $B%&%$%s%I%&$r3+$-$^$9!#$3$l$OFC$K(B
+X11 $B%&%#%s%I%&$r3+$-$^$9!#$3$l$OFC$K(B
 .Nm
 $B$r(B
 .Pa .xsession
@@ -149,7 +152,7 @@
 .Sh $B4XO"%U%!%$%k(B
 .Bl -tag -width Ds
 .It Pa ~/.ssh/identity
-$B$=$N%f!<%6$,%W%m%H%3%k(B $B%P!<%8%g%s(B 1 $B$G;HMQ$9$k(B 
+$B$=$N%f!<%6$,%W%m%H%3%k(B $B%P!<%8%g%s(B 1 $B$G;HMQ$9$k(B
 RSA $BG'>ZMQ$NHkL)80$,F~$C$F$$$^$9!#(B
 .It Pa ~/.ssh/id_dsa
 $B$=$N%f!<%6$,%W%m%H%3%k(B $B%P!<%8%g%s(B 2 $B$G;HMQ$9$k(B
@@ -176,7 +179,7 @@
 OpenSSH $B$O(B Tatu Ylonen $B$K$h$k!"%U%j!<$J(B
 $B%*%j%8%J%kHG(B ssh 1.2.12 $B%j%j!<%9$+$iGI@8$7$?$b$N$G$9!#(B
 Aaron Campbell$B!"(B Bob Beck$B!"(B Markus Friedl$B!"(B Niels Provos$B!"(B
-Theo de Raadt $B$*$h$S(B Dug Song $B$,B?$/$N%P%0$r$H$j=|$-!"(B
+Theo de Raadt $B$*$h$S(B Dug Song $B$,B?$/$N%P%0$r<h$j=|$-!"(B
 $B?7$7$$5!G=$r$U$?$?$SDI2C$7$F(B OpenSSH $B$r$D$/$j$^$7$?!#(B
 SSH $B%W%m%H%3%k(B $B%P!<%8%g%s(B 1.5 $B$*$h$S(B 2.0 $B$N%5%]!<%H$O(B
 Markus Friedl $B$N9W8%$K$h$k$b$N$G$9!#(B
--- ssh-agent.1.orig	Mon Oct  2 18:10:12 2006
+++ ssh-agent.1	Mon Nov 27 22:56:45 2006
@@ -37,10 +37,13 @@
 .\" Japanese translation: $Id: ssh-agent.1,v 1.10 2006/04/17 04:27:52 yusuke Exp $
 .\" by Yusuke Shinyama <yusuke at cs . nyu . edu>
 .\"
+.\" %FreeBSD%
+.\" $FreeBSD$
+.\"
 .Dd September 25, 1999
 .Dt SSH-AGENT 1
 .Os
-.Sh $BL>A0(B
+.Sh $BL>>N(B
 .Nm ssh-agent
 .Nd $BG'>Z%(!<%8%'%s%H(B
 .Sh $B=q<0(B
@@ -54,13 +57,13 @@
 .Nm
 .Op Fl c Li | Fl s
 .Fl k
-.Sh $B@bL@(B
+.Sh $B2r@b(B
 .Nm
 $B$O(B (RSA $B$d(B DSA $B$N(B) $B8x3+80G'>Z$G;H$o$l$kG'>Z80$rJ];}$9$k(B
 $B%W%m%0%i%`$G$9!#4pK\E*$K$O!"$^$:(B
 .Nm
-$B$r(B X$B%;%C%7%g%s$"$k$$$O%m%0%$%s%;%C%7%g%s$N;O$a$K5/F0$5$;!"(B
-$B$3$l0J30$N$9$Y$F$N%&%$%s%I%&$d%W%m%0%i%`$,$=$N(B
+$B$r(B X $B%;%C%7%g%s$"$k$$$O%m%0%$%s%;%C%7%g%s$N;O$a$K5/F0$5$;!"(B
+$B$3$l0J30$N$9$Y$F$N%&%#%s%I%&$d%W%m%0%i%`$,$=$N(B
 ssh-agent $B%W%m%0%i%`$N%/%i%$%"%s%H$H$7$F5/F0$9$k$h$&$K$7$^$9!#(B
 $B%(!<%8%'%s%H$O4D6-JQ?t$r;H$&$3$H$K$h$j!"B>$N%^%7%s$K(B
 .Xr ssh 1
@@ -70,7 +73,7 @@
 .Bl -tag -width Ds
 .It Fl a Ar bind$B$9$k%"%I%l%9(B
 Unix $B%I%a%$%s%=%1%C%H$r(B
-.Ar bind_address 
+.Ar bind_address
 $B$K(B bind $B$9$k$h$&$K$7$^$9!#(B
 $B$3$NCM$O!"%G%U%)%k%H$G$O(B
 .Pa /tmp/ssh-XXXXXXXXXX/agent.\*(Ltppid\*(Gt
@@ -119,16 +122,16 @@
 .Xr ssh-add 1
 $B$O(B
 .Pa ~/.ssh/id_rsa ,
-.Pa ~/.ssh/id_dsa 
+.Pa ~/.ssh/id_dsa
 $B$*$h$S(B
 .Pa ~/.ssh/identity
 $B$N3F%U%!%$%k$rDI2C$7$^$9!#(B
 $B$3$N(B identity $B%U%!%$%k$K%Q%9%U%l!<%:$,I,MW$J>l9g!"(B
 .Xr ssh-add 1
-$B$O$=$N%Q%9%U%l!<%:$r?R$M$F$-$^$9(B 
+$B$O$=$N%Q%9%U%l!<%:$r?R$M$F$-$^$9(B
 (X11 $B$r;H$C$F$$$k$H$-$O!"(B
 .Xr ssh-add 1
-$B$O(B X $B$N$A$g$C$H$7$?%"%W%j%1!<%7%g%s$r;H$$$^$9!"(B
+$B$O(B X $B$N$A$g$C$H$7$?%"%W%j%1!<%7%g%s$r;H$$$^$9!#(B
 X $B$r;H$C$F$$$J$$$H$-$OC<Kv$r;H$C$F?R$M$F$-$^$9(B)$B!#(B
 $B$3$N8e!"(Bidentity $B%U%!%$%k$K4^$^$l$F$$$kG'>Z80$,(B
 $BG'>Z%(!<%8%'%s%H$KAw$i$l$^$9!#(B
@@ -145,7 +148,7 @@
 $BE>Aw$5$l!"%f!<%6$O$=$NG'>Z80$K$h$C$FM?$($i$l$?8"8B$r%M%C%H%o!<%/>e$N(B
 $B$I$3$G$b0BA4$K9T;H$G$-$k$H$$$&$o$1$G$9!#(B
 .Pp
-$BG'>Z%(!<%8%'%s%H$r;H$&$?$a$K$O!"$*$b$K(B 2$B$D$NJ}K!$,$"$j$^$9!#(B
+$BG'>Z%(!<%8%'%s%H$r;H$&$?$a$K$O!"$*$b$K(B 2 $B$D$NJ}K!$,$"$j$^$9!#(B
 $B$R$H$D$O!"G'>Z%(!<%8%'%s%H$,$$$/$D$+$N4D6-JQ?t$r(B export $B$7$?>uBV$G(B
 $B?7$7$$;R%W%m%;%9$rAv$i$;$kJ}K!$G!"$?$H$($P(B
 .Cm ssh-agent xterm &
@@ -156,7 +159,7 @@
 .Xr csh 1
 $B$I$A$i$+$NJ8K!$G@8@.$5$l$^$9(B)$B!"(B
 $BG'>Z%(!<%8%'%s%H$r8F$S=P$7$?%7%'%k$,$=$N%3%^%s%I$rI>2A(B (eval)
-$B$9$kJ}K!$G!"$?$H$($P(B 
+$B$9$kJ}K!$G!"$?$H$($P(B
 .Xr sh 1
 $B$d(B
 .Xr ksh 1
@@ -214,7 +217,7 @@
 OpenSSH $B$O(B Tatu Ylonen $B$K$h$k!"%U%j!<$J(B
 $B%*%j%8%J%kHG(B ssh 1.2.12 $B%j%j!<%9$+$iGI@8$7$?$b$N$G$9!#(B
 Aaron Campbell$B!"(B Bob Beck$B!"(B Markus Friedl$B!"(B Niels Provos$B!"(B
-Theo de Raadt $B$*$h$S(B Dug Song $B$,B?$/$N%P%0$r$H$j=|$-!"(B
+Theo de Raadt $B$*$h$S(B Dug Song $B$,B?$/$N%P%0$r<h$j=|$-!"(B
 $B?7$7$$5!G=$r$U$?$?$SDI2C$7$F(B OpenSSH $B$r$D$/$j$^$7$?!#(B
 SSH $B%W%m%H%3%k(B $B%P!<%8%g%s(B 1.5 $B$*$h$S(B 2.0 $B$N%5%]!<%H$O(B
 Markus Friedl $B$N9W8%$K$h$k$b$N$G$9!#(B
--- ssh-keygen.1.orig	Mon Apr 17 13:27:52 2006
+++ ssh-keygen.1	Mon Nov 27 22:56:45 2006
@@ -40,10 +40,13 @@
 .\" Japanese translation: $Id: ssh-keygen.1,v 1.14 2006/04/17 04:27:52 yusuke Exp $
 .\" by Yusuke Shinyama <yusuke at cs . nyu . edu>
 .\"
+.\" %FreeBSD%
+.\" $FreeBSD$
+.\"
 .Dd September 25, 1999
 .Dt SSH-KEYGEN 1
 .Os
-.Sh $BL>A0(B
+.Sh $BL>>N(B
 .Nm ssh-keygen
 .Nd $BG'>ZMQ$N80$r@8@.!"4IM}!"$*$h$SJQ49$9$k(B
 .Sh $B=q<0(B
@@ -126,7 +129,7 @@
 .Op Fl v
 .Op Fl a Ar $B;n9T2s?t(B
 .Op Fl W Ar $B%8%'%M%l!<%?(B
-.Sh $B@bL@(B
+.Sh $B2r@b(B
 .Nm
 $B$O(B
 .Xr ssh 1
@@ -139,7 +142,7 @@
 $B%*%W%7%g%s$K$h$C$F;XDj$G$-$^$9!#(B
 $B$3$N;XDj$,$J$$>l9g!"(B
 .Nm
-$B$O(B SSH $B%W%m%H%3%k(B $B%P!<%8%g%s(B 2 $B$G;H$o$l$k(B RSA$B80$r@8@.$7$^$9!#(B
+$B$O(B SSH $B%W%m%H%3%k(B $B%P!<%8%g%s(B 2 $B$G;H$o$l$k(B RSA $B80$r@8@.$7$^$9!#(B
 .Pp
 .Nm
 $B$O(B Diffie-Hellman $B728r49(B (DH-GEX) $B$G;H$o$l$k72$r@8@.$9$k$N$K$b;HMQ$7$^$9!#(B
@@ -147,7 +150,7 @@
 .Sx $B78?t(B (modulus) $B$N@8@.(B
 $B$N9`$r;2>H$7$F$/$@$5$$!#(B
 .Pp
-$B$U$D$&!"(BRSA$BG'>Z(B $B$^$?$O(B DSA$BG'>Z$G(B SSH $B$r;H$$$?$$%f!<%6$O!"(B
+$B$U$D$&!"(BRSA $BG'>Z(B $B$^$?$O(B DSA $BG'>Z$G(B SSH $B$r;H$$$?$$%f!<%6$O!"(B
 $B0lEY$3$N%W%m%0%i%`$r<B9T$9$l$P(B
 .Pa ~/.ssh/identity
 $B!"(B
@@ -156,12 +159,12 @@
 .Pa ~/.ssh/id_rsa
 $B$K80(B (identity $B%U%!%$%k(B) $B$r:n$k$3$H$,$G$-$^$9!#$^$?(B
 .Pa /etc/rc
-$B$J$I$G8+$l$i$k$h$&$K!"(B
+$B$J$I$G8+$i$l$k$h$&$K!"(B
 $B%7%9%F%`4IM}<T$,%[%9%H80$r@8@.$9$k$?$a$K$3$N%W%m%0%i%`$r(B
 $B;H$&$3$H$b$G$-$^$9!#(B
 .Pp
 $BDL>o!"$3$N%W%m%0%i%`$O80$r@8@.$7$?$"$H!"$=$N80(B (identity) $B$r$I$N%U%!%$%k$K(B
-$B3JG<$9$l$P$h$$$N$+?R$M$^$9!#8x3+80$O!"HkL)80$r4^$`(B identity 
+$B3JG<$9$l$P$h$$$N$+?R$M$^$9!#8x3+80$O!"HkL)80$r4^$`(B identity
 $B%U%!%$%k$NL>A0$K(B
 .Dq .pub
 $B$r$D$1$?L>A0$N%U%!%$%k$H$7$F3JG<$5$l$^$9!#$^$?$3$N%W%m%0%i%`$O(B
@@ -169,10 +172,10 @@
 $BG$0U$ND9$5$NJ8;zNs$r%Q%9%U%l!<%:$H$7$F;HMQ$9$k$3$H$,$G$-$^$9!#(B
 $B%Q%9%U%l!<%:$r$D$1$J$$$H$-$K$O!"$3$l$O6u$G$b$+$^$$$^$;$s(B
 ($B%[%9%H80$N%Q%9%U%l!<%:$OI,$:6u$G$J$1$l$P$$$1$^$;$s(B)$B!#(B
-$B%Q%i%U%l!<%:$O%Q%9%o!<%I$K;w$F$$$^$9$,!"%Q%9%o!<%I$H$O0c$C$F(B
+$B%Q%9%U%l!<%:$O%Q%9%o!<%I$K;w$F$$$^$9$,!"%Q%9%o!<%I$H$O0c$C$F(B
 $BC18l$NNs$d6gFIE@!"?tCM!"6uGr$J$I!"9%$-$JJ8;z$r4^$a$k$3$H$,$G$-$^$9!#(B
-$B$h$$%Q%9%U%l!<%:$H$O!"(B 10$B!A(B30$BJ8;zDxEY$ND9$5$G!"4JC1$JJ8>O$dMF0W$K(B
-$B?dB,$G$-$k$b$N$G$O$J$$$3$H$G$9(B ($B1Q8l$N;6J8$G$O(B 1$BJ8;z$"$?$j$N%(%s%H%m%T!<$O(B
+$B$h$$%Q%9%U%l!<%:$H$O!"(B10$B!A(B30 $BJ8;zDxEY$ND9$5$G!"4JC1$JJ8>O$dMF0W$K(B
+$B?dB,$G$-$k$b$N$G$O$J$$$3$H$G$9(B ($B1Q8l$N;6J8$G$O(B 1 $BJ8;z$"$?$j$N%(%s%H%m%T!<$O(B
 $B$o$:$+(B 1$B!A(B2 $B%S%C%H$7$+$J$/!"%Q%9%U%l!<%:$H$7$F$OHs>o$KK>$^$7$/$"$j$^$;$s(B)$B!#(B
 $B$^$?BgJ8;z$H>.J8;z$,:.$8$C$F$$$k$b$N$,$h$$$G$7$g$&!#(B
 $B%Q%9%U%l!<%:$O(B
@@ -200,16 +203,16 @@
 $B%*%W%7%g%s$K$O<!$N$h$&$J$b$N$,$"$j$^$9(B:
 .Bl -tag -width Ds
 .It Fl a Ar $B;n9T2s?t(B
-.Fl T 
+.Fl T
 $B%3%^%s%I$r;H$&$H$-$K!"(BDH-GEX $B72$N8uJd$r(B
 $B%9%/%j!<%K%s%0$9$k$?$a$K2?2s$NAG?tH=Dj%F%9%H$r$*$3$J$&$+$r;XDj$7$^$9!#(B
 .It Fl B
 $B;XDj$5$l$?HkL)80$"$k$$$O8x3+80%U%!%$%k$N(B bubblebabble $B%@%$%8%'%9%H$rI=<($7$^$9!#(B
 .It Fl b Ar $B%S%C%H?t(B
 $B@8@.$9$k80$N%S%C%H?t$r;XDj$7$^$9!#(B
-RSA $B80$N>l9g!":G>.$N%5%$%:$O(B 768 $B%S%C%H$G$"$j!"%G%U%)%k%H$O(B 2048$B%S%C%H$G$9!#(B
+RSA $B80$N>l9g!":G>.$N%5%$%:$O(B 768 $B%S%C%H$G$"$j!"%G%U%)%k%H$O(B 2048 $B%S%C%H$G$9!#(B
 $B$U$D$&$O(B 2048 $B%S%C%H$N80$G=<J,$@$H9M$($i$l$F$$$^$9!#(B
-DSA $B80$N>l9g!"(BFIPS 186-2 $B$N5,Dj$K$h$j%5%$%:$O@53N$K(B 1024$B%S%C%H$G$J$1$l$P$J$j$^$;$s!#(B
+DSA $B80$N>l9g!"(BFIPS 186-2 $B$N5,Dj$K$h$j%5%$%:$O@53N$K(B 1024 $B%S%C%H$G$J$1$l$P$J$j$^$;$s!#(B
 .It Fl C Ar $B%3%a%s%H(B
 $B?7$7$$%3%a%s%H$rDI2C$7$^$9!#(B
 .It Fl c
@@ -228,14 +231,6 @@
 $B$N80$rI8=`=PNO$KI=<($7$^$9!#(B
 $B$3$N%*%W%7%g%s$r;H$&$H!"(BOpenSSH $B$N80$r(B
 $B$$$/$D$+$N>&MQ(B SSH $B<BAu$G;H$o$l$F$$$k7A<0$N80$KJQ49$G$-$^$9!#(B
-.It Fl v
-$B>iD9I=<(%b!<%I!#(B
-.Nm
-$B$,?J9TCf$N%G%P%C%0%a%C%;!<%8$rI=<($9$k$h$&$K$7$^$9!#(B
-$B$3$l$O%b%8%e%m@8@.$N%G%P%C%0;~$KLrN)$A$^$9!#(B
-$BJ#?t$N(B
-.Fl v
-$B%*%W%7%g%s$r$D$1$k$H=PNO$,A}$($^$9!#:GBg$O(B 3$B8D$G$9!#(B
 .It Fl F Ar $B%[%9%HL>(B
 $B;XDj$5$l$?(B
 .Ar $B%[%9%HL>(B
@@ -255,7 +250,7 @@
 $B%*%W%7%g%s$r;H$C$F(B) $B<B:]$N;HMQA0$K%9%/%j!<%K%s%0$9$kI,MW$,$"$j$^$9!#(B
 .It Fl g
 .Fl r
-$B%3%^%s%I$r;H$C$F;XLf$N%l%3!<%I$rI=<($9$k$5$$$K!"(B
+$B%3%^%s%I$r;H$C$F;XLf$N%l%3!<%I$rI=<($9$k:]$K!"(B
 Generic DNS $B7A<0$r;HMQ$7$^$9!#(B
 .It Fl H
 .Pa known_hosts
@@ -274,13 +269,13 @@
 $B$3$N%*%W%7%g%s$rE,MQ$7$F$b0BA4$G$9!#(B
 .It Fl i
 $B$3$N%*%W%7%g%s$O(B SSH2-$B8_49$N7A<0$G$"$k!"0E9f2=$5$l$F$$$J$$(B
-$BHkL)80(B ($B$"$k$$$O8x3+80(B) $B%U%!%$%k$rFI$_!"$=$l$r(B 
+$BHkL)80(B ($B$"$k$$$O8x3+80(B) $B%U%!%$%k$rFI$_!"$=$l$r(B
 OpenSSH $B8_49$NHkL)80(B ($B$"$k$$$O8x3+80(B) $B$KJQ49$7$F(B
 $BI8=`=PNO$KI=<($7$^$9!#(B
 .Nm
 $B$O(B
 .Sq SECSH Public Key File Format (SECSH $B8x3+80%U%!%$%k7A<0(B)
-$B$N80$bFI$_$3$a$^$9!#(B
+$B$N80$bFI$_9~$a$^$9!#(B
 $B$3$N%*%W%7%g%s$r;H$&$H!"$$$/$D$+$N>&MQ(B SSH $B<BAu$G;H$o$l$F$$$k(B
 $B80$r(B OpenSSH $B$G;HMQ$G$-$^$9!#(B
 .It Fl l
@@ -291,7 +286,7 @@
 .Nm
 $B$O$=$l$K3:Ev$9$k8x3+80%U%!%$%k$rC5$7=P$7$F$=$N;XLf$rI=<($7$^$9!#(B
 .It Fl M Ar $B%a%b%j(B
-DH-GEX $B$N%b%8%e%m$H$J$kAG?t8uJd$r@8@.$9$k$5$$$N(B
+DH-GEX $B$N%b%8%e%m$H$J$kAG?t8uJd$r@8@.$9$k:]$N(B
 $B%a%b%j>CHqNL$r(B ($B%a%,%P%$%HC10L$G(B) $B;XDj$7$^$9!#(B
 .It Fl N Ar $B?7$7$$%Q%9%U%l!<%:(B
 $B?7$7$$%Q%9%U%l!<%:$r;XDj$7$^$9!#(B
@@ -300,7 +295,7 @@
 .It Fl p
 $B?7$7$/HkL)80$r$D$/$k$N$G$O$J$/!"$9$G$K$"$kHkL)80%U%!%$%k$N%Q%9(B
 $B%U%l!<%:$rJQ99$7$^$9!#$^$:HkL)80$NF~$C$F$$$k%U%!%$%k$r?V$+$l!"(B
-$B8E$$%Q%9%U%l!<%:$rF~NO$7$?$"$H!"?7$7$$%Q%9%o!<%I$r(B 2$B2sF~NO$7$^$9!#(B
+$B8E$$%Q%9%U%l!<%:$rF~NO$7$?$"$H!"?7$7$$%Q%9%o!<%I$r(B 2 $B2sF~NO$7$^$9!#(B
 .It Fl q
 $B@E$+$J(B
 .Nm
@@ -311,16 +306,16 @@
 .Pa known_hosts
 $B%U%!%$%k$+$i!";XDj$5$l$?(B
 .Ar $B%[%9%HL>(B
-$B$KB0$9$k80$r$9$Y$F$H$j=|$-$^$9!#(B
+$B$KB0$9$k80$r$9$Y$F<h$j=|$-$^$9!#(B
 $B$3$N%*%W%7%g%s$O%O%C%7%e$5$l$?%[%9%H(B ($B>e5-$N(B
 .Fl H
-$B%*%W%7%g%s$r;2>H(B) $B$r%U%!%$%k$+$i$H$j=|$/$N$KM-MQ$G$9!#(B
+$B%*%W%7%g%s$r;2>H(B) $B$r%U%!%$%k$+$i<h$j=|$/$N$KM-MQ$G$9!#(B
 .It Fl r Ar $B%[%9%HL>(B
 $B;XDj$5$l$?8x3+80$KBP$9$k(B
 .Ar $B%[%9%HL>(B
 $B$N(B SSHFP fingerprint $B;q8;%l%3!<%I$rI=<($7$^$9!#(B
 .It Fl S Ar $B3+;OE@(B
-DH-GEX $B$N%b%8%e%m$H$J$kAG?t8uJd$r@8@.$9$k:]$N3+;OE@$r(B (16$B?J$G(B) $B;XDj$7$^$9!#(B
+DH-GEX $B$N%b%8%e%m$H$J$kAG?t8uJd$r@8@.$9$k:]$N3+;OE@$r(B (16 $B?J$G(B) $B;XDj$7$^$9!#(B
 .It Fl T Ar $B=PNO%U%!%$%k(B
 (
 .Fl G
@@ -339,6 +334,14 @@
 $B$9$G$KB8:_$7$F$$$k(B RSA $B8x3+80$r%9%^!<%H%+!<%I(B
 .Ar $B%j!<%@(B
 $B$K%"%C%W%m!<%I$7$^$9!#(B
+.It Fl v
+$B>iD9I=<(%b!<%I!#(B
+.Nm
+$B$,?J9TCf$N%G%P%C%0%a%C%;!<%8$rI=<($9$k$h$&$K$7$^$9!#(B
+$B$3$l$O%b%8%e%m@8@.$N%G%P%C%0;~$KLrN)$A$^$9!#(B
+$BJ#?t$N(B
+.Fl v
+$B%*%W%7%g%s$r$D$1$k$H=PNO$,A}$($^$9!#:GBg$O(B 3 $B8D$G$9!#(B
 .It Fl W Ar $B%8%'%M%l!<%?(B
 DH-GEX $BMQ$NAG?t8uJd$r8!::$9$k$H$-$N%8%'%M%l!<%?$r;XDj$7$^$9!#(B
 .It Fl y
@@ -349,7 +352,7 @@
 .Nm
 $B$O!"(BDiffie-Hellman $B728r49(B (Diffie-Hellman Group Exchange, DH-GEX) $B$N$?$a$N(B
 $B72$r@8@.$9$k$N$K$b;H$&$3$H$,$G$-$^$9!#(B
-$B$3$N72$r@8@.$9$k$K$O!"(B2$B$D$NCJ3,$r$U$`I,MW$,$"$j$^$9(B:
+$B$3$N72$r@8@.$9$k$K$O!"(B2 $B$D$NCJ3,$r$U$`I,MW$,$"$j$^$9(B:
 $B$^$:!"AG?t$N8uJd$,@8@.$5$l$^$9!#$3$l$O9bB.$G$9$,!"%a%b%j$r>CHq$7$^$9!#(B
 $B$D$.$K$3$l$i$N8uJd$,E,@Z$+$I$&$+8!::$5$l$^$9(B ($B$3$N$H$-$O(B CPU $B;~4V$r>CHq$7$^$9(B)$B!#(B
 .Pp
@@ -372,7 +375,7 @@
 $B8uJd$H$J$kAG?t$N=89g$,@8@.$5$l$?$"$H$O!"$=$l$i$,E,@Z$+$I$&$+$r(B
 $B8!::$9$kI,MW$,$"$j$^$9!#$3$l$O(B
 .Fl T
-$B%*%W%7%g%s$r$D$+$C$F$*$3$J$($^$9!#$3$N>l9g!"(B
+$B%*%W%7%g%s$r;H$C$F$*$3$J$($^$9!#$3$N>l9g!"(B
 .Nm
 $B$OI8=`F~NO(B ($B$"$k$$$O(B
 .Fl f
@@ -400,7 +403,7 @@
 .Bl -tag -width Ds
 .It Pa ~/.ssh/identity
 $B$=$N%f!<%6$N!"%W%m%H%3%k(B $B%P!<%8%g%s(B 1 $B$K$*$1$k(B
-RSA $BG'>ZMQ(B $BHkL)80$r3JG<$7$^$9!#$3$N%U%!%$%k$O$=$N(B
+RSA $BG'>ZMQ$NHkL)80$r3JG<$7$^$9!#$3$N%U%!%$%k$O$=$N(B
 $B%f!<%60J30$NC/$K$b8+$;$F$O$$$1$^$;$s!#$3$N80$r@8@.$9$k$H$-$K(B
 $B%Q%9%U%l!<%:$r;XDj$9$k$3$H$b$G$-$^$9!#%Q%9%U%l!<%:$O!"(B3DES $B$r;H$C$F(B
 $B%U%!%$%kCf$NHkL)80$NItJ,$r0E9f2=$9$k$N$KMQ$$$i$l$^$9!#$3$N%U%!%$%k$O(B
@@ -417,7 +420,7 @@
 $B$3$N%U%!%$%k$NFbMF$rHkL)$K$7$F$*$/I,MW$O$"$j$^$;$s!#(B
 .It Pa ~/.ssh/id_dsa
 $B$=$N%f!<%6$N!"%W%m%H%3%k(B $B%P!<%8%g%s(B 2 $B$K$*$1$k(B
-DSA $BG'>ZMQ(B $BHkL)80$r3JG<$7$^$9!#$3$N%U%!%$%k$O$=$N(B
+DSA $BG'>ZMQ$NHkL)80$r3JG<$7$^$9!#$3$N%U%!%$%k$O$=$N(B
 $B%f!<%60J30$NC/$K$b8+$;$F$O$$$1$^$;$s!#$3$N80$r@8@.$9$k$H$-$K(B
 $B%Q%9%U%l!<%:$r;XDj$9$k$3$H$b$G$-$^$9!#%Q%9%U%l!<%:$O!"(B3DES $B$r;H$C$F(B
 $B%U%!%$%kCf$NHkL)80$NItJ,$r0E9f2=$9$k$N$KMQ$$$i$l$^$9!#$3$N%U%!%$%k$O(B
@@ -434,7 +437,7 @@
 $B$3$N%U%!%$%k$NFbMF$rHkL)$K$7$F$*$/I,MW$O$"$j$^$;$s!#(B
 .It Pa ~/.ssh/id_rsa
 $B$=$N%f!<%6$N!"%W%m%H%3%k(B $B%P!<%8%g%s(B 2 $B$K$*$1$k(B
-RSA $BG'>ZMQ(B $BHkL)80$r3JG<$7$^$9!#$3$N%U%!%$%k$O$=$N(B
+RSA $BG'>ZMQ$NHkL)80$r3JG<$7$^$9!#$3$N%U%!%$%k$O$=$N(B
 $B%f!<%60J30$NC/$K$b8+$;$F$O$$$1$^$;$s!#$3$N80$r@8@.$9$k$H$-$K(B
 $B%Q%9%U%l!<%:$r;XDj$9$k$3$H$b$G$-$^$9!#%Q%9%U%l!<%:$O!"(B3DES $B$r;H$C$F(B
 $B%U%!%$%kCf$NHkL)80$NItJ,$r0E9f2=$9$k$N$KMQ$$$i$l$^$9!#$3$N%U%!%$%k$O(B
@@ -473,7 +476,7 @@
 OpenSSH $B$O(B Tatu Ylonen $B$K$h$k!"%U%j!<$J(B
 $B%*%j%8%J%kHG(B ssh 1.2.12 $B%j%j!<%9$+$iGI@8$7$?$b$N$G$9!#(B
 Aaron Campbell$B!"(B Bob Beck$B!"(B Markus Friedl$B!"(B Niels Provos$B!"(B
-Theo de Raadt $B$*$h$S(B Dug Song $B$,B?$/$N%P%0$r$H$j=|$-!"(B
+Theo de Raadt $B$*$h$S(B Dug Song $B$,B?$/$N%P%0$r<h$j=|$-!"(B
 $B?7$7$$5!G=$r$U$?$?$SDI2C$7$F(B OpenSSH $B$r$D$/$j$^$7$?!#(B
 SSH $B%W%m%H%3%k(B $B%P!<%8%g%s(B 1.5 $B$*$h$S(B 2.0 $B$N%5%]!<%H$O(B
 Markus Friedl $B$N9W8%$K$h$k$b$N$G$9!#(B
--- ssh-keyscan.1.orig	Mon Oct  2 18:10:28 2006
+++ ssh-keyscan.1	Mon Nov 27 22:56:45 2006
@@ -9,10 +9,13 @@
 .\" Japanese translation: $Id: ssh-keyscan.1,v 1.8 2006/04/17 04:27:53 yusuke Exp $
 .\" by Yusuke Shinyama <yusuke at cs . nyu . edu>
 .\"
+.\" %FreeBSD%
+.\" $FreeBSD$
+.\"
 .Dd January 1, 1996
 .Dt SSH-KEYSCAN 1
 .Os
-.Sh $BL>A0(B
+.Sh $BL>>N(B
 .Nm ssh-keyscan
 .Nd ssh $B8x3+80$r<}=8$9$k(B
 .Sh $B=q<0(B
@@ -26,7 +29,7 @@
 .Op Ar $B%[%9%HL>(B | $B%"%I%l%9%j%9%H(B $B%[%9%HL>%j%9%H(B
 .Op Ar ...
 .Ek
-.Sh $B@bL@(B
+.Sh $B2r@b(B
 .Nm
 $B$OJ#?t$N%[%9%H$+$i(B ssh $BMQ$N%[%9%H8x3+80$r<}=8$9$k$?$a$N(B
 $B%f!<%F%#%j%F%#$G$9!#$3$l$O(B
@@ -34,12 +37,12 @@
 $B%U%!%$%k$r9=C[$7!"8!>Z$9$k$N$KLrN)$D$h$&:n$i$l$F$$$^$9!#(B
 .Nm
 $B$O%7%'%k%9%/%j%W%H$"$k$$$O(B perl $B%9%/%j%W%H$+$i;H$&$N$KE,$7$?!"(B
-$B:G>.8B$N%$%s%?!<%U%'%$%9$rHw$($F$$$^$9!#(B
+$B:G>.8B$N%$%s%?%U%'!<%9$rHw$($F$$$^$9!#(B
 .Pp
 .Nm
-$B$O%N%s%V%m%C%-%s%0(B $B%=%1%C%H(B I/O $B$r;H$$!"$J$k$Y$/B?$/$N%[%9%H$K(B
+$B$O%N%s%V%m%C%-%s%0%=%1%C%H(B I/O $B$r;H$$!"$J$k$Y$/B?$/$N%[%9%H$K(B
 $BJBNs$K%"%/%;%9$7$^$9!#$=$N$?$a$3$l$OHs>o$K8zN(E*$G$9!#(B
-1000$BBf$[$I$N%[%9%H$+$i(B
+1000 $BBf$[$I$N%[%9%H$+$i(B
 $B$J$k%I%a%$%s$N80$b?t==IC$G=8$a$F$7$^$$$^$9!"$?$H$($$$/$D$+$N%[%9%H$G(B
 ssh $B$,Av$C$F$$$J$+$C$?$j!"%[%9%H$,%@%&%s$7$F$$$?$j$7$F$b!"$G$9!#(B
 $B%9%-%c%s$N$?$a$KEv3:%^%7%s$K%m%0%$%s$9$kI,MW$O$"$j$^$;$s!#$^$?!"(B
@@ -56,7 +59,7 @@
 .It Fl f Ar $B%U%!%$%kL>(B
 $B$3$N%U%!%$%k$+$i!"%[%9%HL>$"$k$$$O(B
 .Pa $B%"%I%l%9%j%9%H(B $B%[%9%HL>%j%9%H(B
-$B$NAH$rFI$_9~$_$^$9!#=q<0$O(B 1$B9T(B1$B9`L\$G$9!#0z?t$H$7$F(B
+$B$NAH$rFI$_9~$_$^$9!#=q<0$O(B 1 $B9T(B 1 $B9`L\$G$9!#0z?t$H$7$F(B
 .Pa -
 $B$,;XDj$5$l$?>l9g!"(B
 .Nm
@@ -73,13 +76,13 @@
 $B<1JL2DG=$J>pJs$,L@$i$+$K$J$k$3$H$O$"$j$^$;$s!#(B
 .It Fl p Ar $B%]!<%HHV9f(B
 $B@\B3$9$k%j%b!<%H%[%9%H>e$N%]!<%H$r;XDj$7$^$9!#(B
-.It Fl T
+.It Fl T Ar $B%?%$%`%"%&%HIC?t(B
 $B@\B3MW5a$,%?%$%`%"%&%H$9$k$^$G$NIC?t$r;XDj$7$^$9!#(B
 $B$"$k%[%9%H$K@\B3$r;n$_$F$+$i!"$"$k$$$O:G8e$K$=$N%[%9%H$+$i2?$+(B
 $B<u?.$7$F$+$i(B
 .Pa timeout
 $BIC$,7P2a$9$k$H$=$N@\B3$OJD$8$i$l!"LdBj$N%[%9%H$O;HMQITG=$H$7$F(B
-$BG'<1$5$l$^$9!#%G%U%)%k%H$G$O(B 5$BIC$G$9!#(B
+$BG'<1$5$l$^$9!#%G%U%)%k%H$G$O(B 5 $BIC$G$9!#(B
 .It Fl t Ar $B80$N<oN`(B
 $B%[%9%H$+$i<hF@$9$k80$N<oN`$r;XDj$7$^$9!#(B
 $B$H$j$&$kCM$O!"%W%m%H%3%k(B $B%P!<%8%g%s(B 1 $B$N(B
@@ -89,7 +92,7 @@
 $B$"$k$$$O(B
 .Dq dsa
 $B$G$9!#(B
-$BJ#?t$NCM$r;XDj$9$k$H$-$O!"%+%s%^$G6h@Z$C$F$/$@$5$$!#(B
+$BJ#?t$NCM$r;XDj$9$k$H$-$O!"%3%s%^$G6h@Z$C$F$/$@$5$$!#(B
 $B%G%U%)%k%H$G$O$3$l$O(B
 .Dq rsa1
 $B$K$J$C$F$$$^$9!#(B
@@ -100,7 +103,7 @@
 .El
 .Sh $B%;%-%e%j%F%#(B
 .Nm
-$B$r$D$+$C$F!"80$r8!>Z$;$:$K(B ssh_known_hosts $B%U%!%$%k$r9=C[$7$?>l9g!"(B
+$B$r;H$C$F!"80$r8!>Z$;$:$K(B ssh_known_hosts $B%U%!%$%k$r9=C[$7$?>l9g!"(B
 .Em man in the middle
 ($B$J$j$9$^$7(B) $B967b$KBP$7$FL5KIHw$K$J$j$^$9!#(B
 $B$$$C$]$&!"$*;H$$$N%;%-%e%j%F%#%b%G%k$,$=$N$h$&$J4m81$r(B
@@ -149,7 +152,7 @@
 .Pa ssh_known_hosts
 $B%U%!%$%k$K$"$k$b$N$H80$,0c$C$F$$$k%[%9%H$r8+$D$1$k(B:
 .Bd -literal
-$ ssh-keyscan -t rsa,dsa -f ssh_hosts | \e\ 
+$ ssh-keyscan -t rsa,dsa -f ssh_hosts | \e\
 	sort -u - ssh_known_hosts | diff ssh_known_hosts -
 .Ed
 .Sh $B4XO"9`L\(B
@@ -166,4 +169,4 @@
 $B$3$N%W%m%0%i%`$O%9%-%c%s$7$?$9$Y$F$N%^%7%s$N%3%s%=!<%k>e$K(B
 "Connection closed by remote host" $B$N%a%C%;!<%8$r;D$7$^$9!#(B
 $B$3$l$O!"$3$N%W%m%0%i%`$,(B ssh $BMQ$N%]!<%H$K@\B3$7$?$"$H!"(B
-$B8x3+80$rFI$_$3$s$G$9$0$K@\B3$r@Z$C$F$7$^$&$?$a$G$9!#(B
+$B8x3+80$rFI$_9~$s$G$9$0$K@\B3$r@Z$C$F$7$^$&$?$a$G$9!#(B
--- ssh-keysign.8.orig	Mon Oct  2 18:12:25 2006
+++ ssh-keysign.8	Mon Nov 27 22:56:46 2006
@@ -25,20 +25,23 @@
 .\" Japanese translation: $Id: ssh-keysign.8,v 1.6 2006/04/17 04:27:53 yusuke Exp $
 .\" by Yusuke Shinyama <yusuke at cs . nyu . edu>
 .\"
+.\" %FreeBSD%
+.\" $FreeBSD$
+.\"
 .Dd May 24, 2002
 .Dt SSH-KEYSIGN 8
 .Os
-.Sh $BL>A0(B
+.Sh $BL>>N(B
 .Nm ssh-keysign
 .Nd $B%[%9%H%Y!<%9%I(B (host-based) $BG'>Z$K$*$1$k(B ssh $B$NJd=u%W%m%0%i%`(B
 .Sh $B=q<0(B
 .Nm
-.Sh $B@bL@(B
+.Sh $B2r@b(B
 .Nm
 $B$O!"(B
 .Xr ssh 1
 $B$,%m!<%+%k%[%9%H80$K%"%/%;%9$7!"(B
-SSH $B%W%m%H%3%k(B $B%P!<%8%g%s(B 2 $B$G%[%9%H%Y!<%9%I(B (host-based) $BG'>Z$r$*$3$J$&$5$$$K(B
+SSH $B%W%m%H%3%k(B $B%P!<%8%g%s(B 2 $B$G%[%9%H%Y!<%9%I(B (host-based) $BG'>Z$r$*$3$J$&:]$K(B
 $BI,MW$J%G%8%?%k=pL>$r@8@.$9$k$N$K;H$o$l$^$9!#(B
 .Pp
 .Nm
@@ -60,7 +63,7 @@
 $B$*$h$S(B
 .Xr sshd 8
 $B$r;2>H$7$F$/$@$5$$!#(B
-.Sh $B%U%!%$%k(B
+.Sh $B4XO"%U%!%$%k(B
 .Bl -tag -width Ds
 .It Pa /etc/ssh/ssh_config
 $B$3$N%U%!%$%k$K$h$j!"(B
--- ssh.1.orig	Wed Nov  8 12:14:15 2006
+++ ssh.1	Mon Nov 27 22:56:46 2006
@@ -39,10 +39,13 @@
 .\" Japanese translation: $Id: ssh.1,v 1.19 2006/04/17 04:27:53 yusuke Exp $
 .\" by Yusuke Shinyama <yusuke at cs . nyu . edu>
 .\"
+.\" %FreeBSD: src/crypto/openssh/ssh.1,v 1.31.2.3 2006/11/11 00:51:28 des Exp %
+.\" $FreeBSD$
+.\"
 .Dd September 25, 1999
 .Dt SSH 1
 .Os
-.Sh $BL>A0(B
+.Sh $BL>>N(B
 .Nm ssh
 .Nd OpenSSH SSH $B%/%i%$%"%s%H(B ($B%j%b!<%H(B $B%m%0%$%s(B $B%W%m%0%i%`(B)
 .Sh $B=q<0(B
@@ -87,18 +90,18 @@
 .Oo Ar $B%f!<%6(B Ns @ Oc Ns Ar $B%[%9%HL>(B
 .Op Ar $B%3%^%s%I(B
 .Ek
-.Sh $B@bL@(B
+.Sh $B2r@b(B
 .Nm
 (SSH $B%/%i%$%"%s%H(B) $B$O%j%b!<%H%^%7%s$K%m%0%$%s$7$?$j!"(B
 $B%j%b!<%H%^%7%s>e$G%3%^%s%I$r<B9T$9$k$?$a$N%W%m%0%i%`$G$9!#(B
 $B$3$l$O(B rlogin $B$H(B rsh $B$rCV$-49$($k$?$a$N$b$N$G!"(B
 $B0BA4$G$J$$%M%C%H%o!<%/>e$K$"$k(B
-2$B$D$N?.Mj$5$l$F$$$J$$%[%9%H4V$G!"(B
+2 $B$D$N?.Mj$5$l$F$$$J$$%[%9%H4V$G!"(B
 $B0E9f2=$5$l$?0BA4$JDL?.$rDs6!$7$^$9!#(BX11 $B@\B3$d(B
 $BG$0U$N(B TCP $B%]!<%H$J$I$b0BA4$JDL?.O)$rDL$7$FE>Aw$G$-$^$9!#(B
 .Pp
 .Nm
-$B$O;XDj$5$l$?(B 
+$B$O;XDj$5$l$?(B
 .Ar $B%[%9%HL>(B
 $B$K@\B3$7!"(B
 ($B%*%W%7%g%s$,;XDj$5$l$?>l9g$O$=$N(B
@@ -108,7 +111,7 @@
 $B%f!<%6$O%j%b!<%H%^%7%s$KBP$7$F!"(B
 $BK\?M$G$"$k$3$H$r>ZL@$9$kI,MW$,$"$j$^$9!#(B
 $B%W%m%H%3%k$N%P!<%8%g%s$K1~$8$F!"$3$l$K$O(B
-$B$$$/$D$+$"$kJ}K!$+$i0l$D$r;H$$$^$9(B ($B2<5-;2>H(B) :
+$B$$$/$D$+$"$kJ}K!$+$i$R$H$D$r;H$$$^$9(B ($B2<5-;2>H(B) :
 .Pp
 .Ar $B%3%^%s%I(B
 $B$,;XDj$5$l$?>l9g!"%j%b!<%H%[%9%H>e$G$O(B
@@ -142,10 +145,10 @@
 .It Fl a
 $BG'>Z%(!<%8%'%s%H$NE>Aw$r6X;_$7$^$9!#(B
 .It Fl b Ar bind$B$9$k%"%I%l%9(B
-$B@\B3$N%=!<%9B&$N%$%s%?%U%'%$%9$H$7$F!"(B
+$B@\B3$N%=!<%9B&$N%$%s%?%U%'!<%9$H$7$F!"(B
 .Ar bind$B$9$k%"%I%l%9(B
 $B$r;H$$$^$9!#(B
-$B$3$l$,M-MQ$J$N$O!"J#?t$N(BIP$B%"%I%l%9$r$b$D%^%7%s>e$N$_$G$9!#(B
+$B$3$l$,M-MQ$J$N$O!"J#?t$N(B IP $B%"%I%l%9$r$b$D%^%7%s>e$N$_$G$9!#(B
 .It Fl C
 $B$9$Y$F$N%G!<%?$r05=L$9$k$h$&;X<($7$^$9(B ($BI8=`F~NO!"I8=`=PNO!"(B
 $BI8=`%(%i!<=PNO!"E>Aw$5$l$?(B X11 $B$d(B TCP $B@\B3$r4^$`(B)$B!#05=L$K(B
@@ -168,10 +171,10 @@
 .Dq 3des $B!"(B
 .Dq blowfish
 $B$*$h$S(B
-.Dq des 
+.Dq des
 $B$,%5%]!<%H$5$l$F$$$^$9!#(B
 .Ar 3des
-($B%H%j%W%k(B des) $B$O(B 3$B$D$N0[$J$k80$r$D$+$C$F(B
+($B%H%j%W%k(B des) $B$O(B 3 $B$D$N0[$J$k80$r;H$C$F(B
 $B0E9f2=(B-$BI|9f2=(B-$B0E9f2=$r$*$3$J$$$^$9!#(B
 $B$3$l$O0BA4$G$"$k$H9M$($i$l$F$$$k$?$a$G$9!#(B
 .Ar blowfish
@@ -191,7 +194,7 @@
 .Pp
 $B%W%m%H%3%k(B $B%P!<%8%g%s(B 2 $B$G$O!"(B
 .Ar cipher_spec
-$B$O%+%s%^$G6h@Z$i$l$?%j%9%H$K$J$C$F$*$j!"(B
+$B$O%3%s%^$G6h@Z$i$l$?%j%9%H$K$J$C$F$*$j!"(B
 $B0E9fJ}<0$NM%@h=g0L$r;XDj$G$-$^$9!#(B
 $B8=:_%5%]!<%H$5$l$F$$$k0E9fJ}<0$O0J2<$N$H$*$j$G$9(B:
 3des-cbc ,
@@ -235,7 +238,7 @@
 $B:#$N$H$3$m(B SOCKS4 $B$*$h$S(B SOCKS5 $B%W%m%H%3%k$,;H$o$l$F$*$j!"(B
 .Nm
 $B$O(B SOCKS $B%5!<%P$N$h$&$K$U$k$^$$$^$9!#(B
-$BFC8"%]!<%H$rE>Aw$G$-$k$N$O%9!<%Q!<%f!<%6$@$1$G$9!#(B
+$BFC8"%]!<%H$rE>Aw$G$-$k$N$O%9!<%Q%f!<%6$@$1$G$9!#(B
 $BF0E*%]!<%HE>Aw$O@_Dj%U%!%$%k$G$b;XDj$G$-$^$9!#(B
 .Pp
 IPv6 $B%"%I%l%9$O$3$l$H$OJL$N7A<0$G;XDj$G$-$^$9(B:
@@ -246,7 +249,7 @@
 .Xc
 .Sm on
 $B$"$k$$$O!"%"%I%l%9$r3Q%+%C%3(B [ ] $B$G0O$s$G$/$@$5$$!#(B
-$BFC8"%]!<%H$rE>Aw$G$-$k$N$O%9!<%Q!<%f!<%6$@$1$G$9!#(B
+$BFC8"%]!<%H$rE>Aw$G$-$k$N$O%9!<%Q%f!<%6$@$1$G$9!#(B
 $B%G%U%)%k%H$G$O!"%m!<%+%kB&$N%]!<%H$O(B
 .Cm GatewayPorts
 $B$N@_Dj$K=>$C$F(B bind $B$5$l$^$9$,!"(B
@@ -260,7 +263,7 @@
 $B;HMQ2DG=$G$"$k$3$H$r<($7$^$9!#$$$C$]$&!"6u$N%"%I%l%9$d(B
 .Sq *
 $B$r;XDj$9$k$H!"$=$N%]!<%H$O(B
-$B$9$Y$F$N%$%s%?!<%U%'%$%9$KBP$7$F;HMQ2DG=$K$J$j$^$9!#(B
+$B$9$Y$F$N%$%s%?%U%'!<%9$KBP$7$F;HMQ2DG=$K$J$j$^$9!#(B
 .It Fl e Ar $B%(%9%1!<%WJ8;z(B
 $B2>A[C<Kv$r;H$&%;%C%7%g%s$K$*$1$k%(%9%1!<%WJ8;z$r;XDj$7$^$9(B
 ($B%G%U%)%k%H$O(B
@@ -270,7 +273,7 @@
 .Ql \&.
 $B$,$-$?>l9g$=$N@\B3$OJD$8$i$l!"(Bcontrol-Z $B$,$-$?>l9g$K$O(B
 $B$=$N@\B3$O%5%9%Z%s%I$5$l$^$9!#(B
-$B$3$N%(%9%1!<%WJ8;z<+?H$,B3$$$?$H$-$K$O!"$3$NJ8;z$,(B 1$B2s$@$1Aw$i$l$^$9!#(B
+$B$3$N%(%9%1!<%WJ8;z<+?H$,B3$$$?$H$-$K$O!"$3$NJ8;z$,(B 1 $B2s$@$1Aw$i$l$^$9!#(B
 $B%(%9%1!<%WJ8;z$r(B
 .Dq none
 $B$K;XDj$9$k$H$"$i$f$k%(%9%1!<%W5!G=$,6X;_$5$l!"(B
@@ -281,7 +284,7 @@
 $B%7%9%F%`A4BN$N@_Dj%U%!%$%k(B
 .Pq Pa /etc/ssh/ssh_config
 $B$OL5;k$5$l$^$9!#%G%U%)%k%H$G$O!"%f!<%6Kh$N@_Dj%U%!%$%k$O(B
-.Pa ~/.ssh/config 
+.Pa ~/.ssh/config
 $B$K$J$C$F$$$^$9!#(B
 .It Fl f
 .Nm
@@ -306,7 +309,7 @@
 $BM-8z$K$7$F%3%s%Q%$%k$5$l$F$$$k$H$-$@$1M-8z$G$9(B
 ($B%G%U%)%k%H$G$O%5%]!<%H$5$l$F$$$^$;$s(B)$B!#(B
 .It Fl i Ar identity$B%U%!%$%k(B
-RSA$BG'>Z(B $B$"$k$$$O(B DSA $BG'>Z$N$5$$$K(B
+RSA $BG'>Z(B $B$"$k$$$O(B DSA $BG'>Z$N:]$K(B
 identity ($BHkL)80(B) $B$rFI$`%U%!%$%k$r;XDj$7$^$9!#(B
 $B%G%U%)%k%H$O!"%W%m%H%3%k(B $B%P!<%8%g%s(B 1 $B$N>l9g(B
 $B%f!<%6$N%[!<%`%G%#%l%/%H%j$K$"$k(B
@@ -353,7 +356,7 @@
 .Xc
 .Sm on
 $B$^$?$O%"%I%l%9$r3Q%+%C%3(B [ ] $B$G0O$s$G$/$@$5$$!#(B
-$BFC8"%]!<%H$rE>Aw$G$-$k$N$O%9!<%Q!<%f!<%6(B $B$@$1$G$9!#(B
+$BFC8"%]!<%H$rE>Aw$G$-$k$N$O%9!<%Q%f!<%6(B $B$@$1$G$9!#(B
 $B%G%U%)%k%H$G$O!"%m!<%+%kB&$N%]!<%H$O(B
 .Cm GatewayPorts
 $B$N@_Dj$K=>$C$F(B bind $B$5$l$^$9$,!"(B
@@ -365,7 +368,7 @@
 $B$r;XDj$9$k$H!"%]!<%H$r(B listen $B$9$k$N$O%m!<%+%k$J;HMQ$N$_$K8B$k$3$H$K$J$j$^$9!#(B
 $B$$$C$]$&!"6u$N%"%I%l%9$^$?$O(B
 .Sq \&*
-$B$r;XDj$9$k$H!"$=$N%]!<%H$O$9$Y$F$N%$%s%?!<%U%'%$%9$KBP$7$F;HMQ2DG=$K$J$j$^$9!#(B
+$B$r;XDj$9$k$H!"$=$N%]!<%H$O$9$Y$F$N%$%s%?%U%'!<%9$KBP$7$F;HMQ2DG=$K$J$j$^$9!#(B
 .It Fl l Ar $B%m%0%$%sL>(B
 $B%j%b!<%H%^%7%s>e$G%m%0%$%s$9$k%f!<%6L>$r;XDj$7$^$9!#(B
 $B$3$l$O@_Dj%U%!%$%k$K$h$C$F!"%[%9%H$4$H$K;XDj$9$k$3$H$b$G$-$^$9!#(B
@@ -386,7 +389,7 @@
 .Cm ControlMaster
 $B$N9`$r;2>H$7$F$/$@$5$$!#(B
 .It Fl m Ar MAC$B;XDj(B
-$B%W%m%H%3%k(B $B%P!<%8%g%s(B 2 $B$G$O!"%+%s%^$G6h@Z$C$?%j%9%H$K$h$j!"(B
+$B%W%m%H%3%k(B $B%P!<%8%g%s(B 2 $B$G$O!"%3%s%^$G6h@Z$C$?%j%9%H$K$h$j!"(B
 $B;HMQ$9$k(B MAC (message authentication code$B!"(B
 $B%a%C%;!<%8G'>Z%3!<%I(B) $B$rM%@h=g0L$r(B
 $B$D$1$F;XDj$9$k$3$H$,$G$-$^$9!#(B
@@ -423,7 +426,7 @@
 $B$N;XNa$O%^%9%?!<%W%m%;%9$KEO$5$l$^$9!#(B
 $B;HMQ2DG=$J%3%^%s%I$O0J2<$N$H$*$j$G$9(B:
 .Dq check
-($B%^%9%?!<%W%m%;%9$,Av$C$F$$$k$+$I$&$+%A%'%C%/$9$k(B) 
+($B%^%9%?!<%W%m%;%9$,Av$C$F$$$k$+$I$&$+%A%'%C%/$9$k(B)
 $B$*$h$S(B
 .Dq exit
 ($B%^%9%?!<%W%m%;%9$r=*N;$9$k$h$&;X<($9$k(B)
@@ -498,6 +501,7 @@
 .It User
 .It UserKnownHostsFile
 .It VerifyHostKeyDNS
+.It VersionAddendum
 .It XAuthLocation
 .El
 .It Fl p Ar $B%]!<%H(B
@@ -538,7 +542,7 @@
 .Sm on
 .Pp
 $B%G%U%)%k%H$G$O!"%5!<%PB&$G(B listen $B$9$k%=%1%C%H$O(B
-$B%k!<%W%P%C%/%$%s%?!<%U%'%$%9$N$_$K(B bind $B$5$l$^$9!#(B
+$B%k!<%W%P%C%/%$%s%?%U%'!<%9$N$_$K(B bind $B$5$l$^$9!#(B
 $B$3$l$O(B
 .Ar bind$B$9$k%"%I%l%9(B
 $B$r;XDj$9$k$3$H$K$h$C$F>e=q$-$9$k$3$H$,$G$-$^$9!#(B
@@ -547,7 +551,7 @@
 $B$^$?$O(B
 .Ql *
 $B$r%"%I%l%9$H$7$F;XDj$9$k$H!"%5!<%PB&$N%=%1%C%H$O(B
-$B$9$Y$F$N%$%s%?!<%U%'%$%9$KBP$7$F(B listen $B$9$k$h$&$K$J$j$^$9!#(B
+$B$9$Y$F$N%$%s%?%U%'!<%9$KBP$7$F(B listen $B$9$k$h$&$K$J$j$^$9!#(B
 .Ar bind$B$9$k%"%I%l%9(B
 $B$K%k!<%W%P%C%/0J30$NCM$,;XDj$G$-$k$N$O!"(B
 .Cm GatewayPorts
@@ -555,7 +559,7 @@
 .Xr sshd_config 5
 $B$r;2>H$7$F$/$@$5$$(B)$B!#(B
 .It Fl S Ar $B@)8fMQ%Q%9L>(B
-$B@\B3$r6&M-$9$k$5$$$N@)8fMQ%=%1%C%H$N0LCV$r;XDj$7$^$9!#(B
+$B@\B3$r6&M-$9$k:]$N@)8fMQ%=%1%C%H$N0LCV$r;XDj$7$^$9!#(B
 $B>\:Y$K$D$$$F$O(B
 .Xr ssh_config 5
 $B$N(B
@@ -577,7 +581,7 @@
 $BG$0U$N2hLL%Y!<%9$N%W%m%0%i%`$r<B9T$9$k$H$-(B
 ($B$?$H$($P!"%a%K%e!<%5!<%S%9$r<BAu$9$k$H$-$J$I(B)
 $B$KHs>o$KJXMx$G$9!#(B
-$BJ#?t$N(B 
+$BJ#?t$N(B
 .Fl t
 $B$r$D$1$k$H!"$?$H$((B
 .Nm
@@ -592,7 +596,7 @@
 $B$3$l$O@\B3$dG'>Z!"@_Dj$NLdBj$r%G%P%C%0$9$k$H$-$K=u$1$H$J$j$^$9!#(B
 $BJ#?t$N(B
 .Fl v
-$B%*%W%7%g%s$r$D$1$k$H=PNO$,A}$($^$9!#:GBg$O(B 3$B8D$G$9!#(B
+$B%*%W%7%g%s$r$D$1$k$H=PNO$,A}$($^$9!#:GBg$O(B 3 $B8D$G$9!#(B
 .It Fl w Xo
 .Ar $B%m!<%+%k(Btun Ns Op : Ns Ar $B%j%b!<%H(Btun
 .Xc
@@ -610,9 +614,9 @@
 If
 .Ar $B%j%b!<%H(Btun
 $B$,;XDj$5$l$J$$>l9g$O!"%G%U%)%k%H$G(B
-.Dq any 
+.Dq any
 $B$K$J$j$^$9!#(B
-.Xr ssh_config 5 
+.Xr ssh_config 5
 $B$N(B
 .Cm TunnelDevice
 $B9`L\$b;2>H$7$F$/$@$5$$!#(B
@@ -668,7 +672,7 @@
 .Nm
 $B$O%W%m%H%3%k(B $B%P!<%8%g%s(B 1 $B$KLa$j$^$9!#(B
 $B$3$N@_Dj$O(B
-.Xr ssh_config 5 
+.Xr ssh_config 5
 $B$N(B
 .Cm Protocol
 $B@_Dj9`L\$GJQ99$9$k$+!"$"$k$$$O(B
@@ -694,12 +698,12 @@
 $B$*$h$S%Q%9%o!<%IG'>Z(B (password authentication) $B$G$9!#(B
 $BG'>ZJ}<0$O$3$3$K<($7$?=g=x$G;HMQ$5$l$^$9!#(B
 $B$?$@$7%W%m%H%3%k(B $B%P!<%8%g%s(B 2 $B$G$O(B
-.Cm PreferredAuthentications 
+.Cm PreferredAuthentications
 $B@_Dj9`L\$K$h$j$3$N%G%U%)%k%H$N=g=x$rJQ99$9$k$3$H$b$G$-$^$9!#(B
 .Pp
 $B%[%9%H%Y!<%9%IG'>Z(B (hostbased authentication) $B$O(B
 $B0J2<$N$h$&$KF0:n$7$^$9(B:
-$B%f!<%6$,(B 
+$B%f!<%6$,(B
 .Nm
 $B$r<B9T$9$k%^%7%s$,!"%j%b!<%H%^%7%sB&$N(B
 .Pa /etc/hosts.equiv
@@ -718,7 +722,7 @@
 ($B0J2<$N(B
 .Pa /etc/ssh/ssh_known_hosts
 $B$H(B
-.Pa ~/.ssh/known_hosts 
+.Pa ~/.ssh/known_hosts
 $B$r;2>H(B)
 $B$,(B
 .Em $BI,$:(B
@@ -735,7 +739,7 @@
 $B8x3+80G'>Z(B (public key authentication) $B$O(B
 $B0J2<$N$h$&$K$7$FF0:n$7$^$9(B:
 $B$3$N$d$j$+$?$O8x3+800E9f5;=Q$K4p$E$$$F$*$j!"(B
-$B0E9f2=$HI|9f$r$=$l$>$lJL$N80$r$D$+$C$F$*$3$J$&(B
+$B0E9f2=$HI|9f$r$=$l$>$lJL$N80$r;H$C$F$*$3$J$&(B
 $B$3$H$,$G$-!"$5$i$KI|9fMQ$N80$+$i0E9f2=MQ$N80$r(B
 $B?dB,$9$k$3$H$O8=<BE*$K$G$-$J$$$h$&$J0E9fJ}<0$r;H$C$F$$$^$9!#(B
 $B$3$N%"%$%G%"$O!"$^$:3F%f!<%6$,G'>Z$N$?$a$N(B
@@ -755,9 +759,9 @@
 .Pp
 .Pa ~/.ssh/authorized_keys
 $B%U%!%$%k$K$O!"%m%0%$%s$,5v2D$5$l$F$$$k(B
-$B8x3+80$N0lMw$,=q$+$l$F$$$^$9!#%f!<%6$,%m%0%$%s$9$k$5$$!"(B
+$B8x3+80$N0lMw$,=q$+$l$F$$$^$9!#%f!<%6$,%m%0%$%s$9$k:]!"(B
 .Nm
-$B%W%m%0%i%`$O!"$=$N%f!<%6$,$I$N80$NBP$r$D$+$C$F(B
+$B%W%m%0%i%`$O!"$=$N%f!<%6$,$I$N80$NBP$r;H$C$F(B
 $BG'>Z$7$h$&$H$7$F$$$k$+$r%5!<%P$KEA$($^$9!#(B
 $B%/%i%$%"%s%H$O<+J,$,HkL)80$K%"%/%;%9$G$-$k$3$H$r(B
 $B%5!<%P$KBP$7$F>ZL@$7!"%5!<%P$O$=$l$KBP1~$9$k8x3+80$,(B
@@ -766,21 +770,21 @@
 .Pp
 $B%f!<%6$O(B
 .Xr ssh-keygen 1
-$B$r$D$+$C$F<+J,$N80$NBP$r$D$/$j$^$9!#(B
+$B$r;H$C$F<+J,$N80$NBP$r$D$/$j$^$9!#(B
 $B$3$N%W%m%0%i%`$O!"HkL)80$r%f!<%6$N%[!<%`%G%#%l%/%H%jFb$N(B
 .Pa ~/.ssh/identity
 ($B%W%m%H%3%k(B $B%P!<%8%g%s(B 1)$B!"(B
 .Pa ~/.ssh/id_dsa
-($B%W%m%H%3%k(B $B%P!<%8%g%s(B 2$B!"(BDSA$BJ}<0(B) $B$"$k$$$O(B
+($B%W%m%H%3%k(B $B%P!<%8%g%s(B 2$B!"(BDSA $BJ}<0(B) $B$"$k$$$O(B
 .Pa ~/.ssh/id_rsa
-($B%W%m%H%3%k(B $B%P!<%8%g%s(B 2$B!"(BRSA$BJ}<0(B) $B$K3JG<$7!"(B
+($B%W%m%H%3%k(B $B%P!<%8%g%s(B 2$B!"(BRSA $BJ}<0(B) $B$K3JG<$7!"(B
 $B8x3+80$r(B
 .Pa ~/.ssh/identity.pub
 ($B%W%m%H%3%k(B $B%P!<%8%g%s(B 1)$B!"(B
 .Pa ~/.ssh/id_dsa.pub
-($B%W%m%H%3%k(B $B%P!<%8%g%s(B 2$B!"(BDSA$BJ}<0(B) $B$"$k$$$O(B
+($B%W%m%H%3%k(B $B%P!<%8%g%s(B 2$B!"(BDSA $BJ}<0(B) $B$"$k$$$O(B
 .Pa ~/.ssh/id_rsa.pub
-($B%W%m%H%3%k(B $B%P!<%8%g%s(B 2$B!"(BRSA$BJ}<0(B) $B$K3JG<$7$^$9!#(B
+($B%W%m%H%3%k(B $B%P!<%8%g%s(B 2$B!"(BRSA $BJ}<0(B) $B$K3JG<$7$^$9!#(B
 $B%f!<%6$O$3$N8x3+80$r%j%b!<%H%^%7%s>e$N(B
 $B<+J,$N%[!<%`%G%#%l%/%H%j$K$"$k(B
 .Pa ~/.ssh/authorized_keys
@@ -788,7 +792,7 @@
 .Pa authorized_keys
 $B%U%!%$%k$O=>Mh$N(B
 .Pa ~/.rhosts
-$B%U%!%$%k$KAjEv$7!"(B1$B9T$4$H$K$R$H$D$N80$r3JG<$7$^$9!#(B
+$B%U%!%$%k$KAjEv$7!"(B1 $B9T$4$H$K$R$H$D$N80$r3JG<$7$^$9!#(B
 $B3F9T$O$+$J$jD9$/$J$k$3$H$b$"$j$^$9(B)$B!#(B
 $B$3$N8e!"%f!<%6$O%Q%9%o!<%I$J$7$G%m%0%$%s$9$k$3$H$,$G$-$^$9!#(B
 .Pp
@@ -805,10 +809,10 @@
 $B%W%m%H%3%k(B $B%P!<%8%g%s(B 2 $B$G$OJ#?t$N%A%c%l%s%8$H%l%9%]%s%9$r(B
 $B5v2D$7$F$$$^$9!#(B
 $B%W%m%H%3%k(B $B%P!<%8%g%s(B 1 $B$G;H$($k%A%c%l%s%8$H%l%9%]%s%9$O(B
-1$B$D$@$1$G$9!#(B
+1 $B$D$@$1$G$9!#(B
 $B%A%c%l%s%8!&%l%9%]%s%9G'>Z$NNc$H$7$F$O!"(B
 BSD $BG'>Z(B (
-.Xr login.conf 5 
+.Xr login.conf 5
 $B$r;2>H(B) $B$d(B PAM (OpenBSD $B0J30$N$$$/$D$+$N%7%9%F%`(B) $B$J$I$,(B
 $B$"$j$^$9!#(B
 .Pp
@@ -817,7 +821,7 @@
 $B$O%f!<%6$K%Q%9%o!<%I$rMW5a$7$^$9!#(B
 $B$3$N%Q%9%o!<%I$O8!::$N$?$a%j%b!<%H%[%9%H$KAw$i$l$^$9$,!"(B
 $B$9$Y$F$NDL?.$O0E9f2=$5$l$F$$$k$?$a!"(B
-$B%M%C%H%o!<%/$rEpD0$7$F$$$k2?J*$+$K(B
+$B%M%C%H%o!<%/$rEpD0$7$F$$$k2?<T$+$K(B
 $B$h$C$F%Q%9%o!<%I$,8+$i$l$F$7$^$&$h$&$J$3$H$O$"$j$^$;$s!#(B
 .Pp
 .Nm
@@ -844,7 +848,7 @@
 $B%j%b!<%H$N%7%'%k$d%3%^%s%I$K$*$1$k$9$Y$F$NDL?.$O(B
 $B<+F0E*$K0E9f2=$5$l$^$9!#(B
 .Pp
-$B2>A[C<Kv$,3d$jEv$F$i$l$F$$$k>l9g(B 
+$B2>A[C<Kv$,3d$jEv$F$i$l$F$$$k>l9g(B
 ($BDL>o$N%m%0%$%s%;%C%7%g%s;~(B)$B!"%f!<%6$O(B
 $B0J2<$N%(%9%1!<%WJ8;z$r;H$&$3$H$,$G$-$^$9!#(B
 .Pp
@@ -865,7 +869,7 @@
 $B$G$O%(%9%1!<%WJ8;z$r;H$C$?5!G=$,(B
 $B$$$/$D$+%5%]!<%H$5$l$F$$$^$9!#(B
 .Pp
-$B%A%k%@5-9f$=$N$b$N$r(B 1$B2sF~NO$9$k$K$O(B
+$B%A%k%@5-9f$=$N$b$N$r(B 1 $B2sF~NO$9$k$K$O(B
 .Ic ~~
 $B$r2!$9$+!">e$G=R$Y$i$l$F$$$k0J30$NJ8;z$r%A%k%@$KB3$1$^$9!#(B
 $B%(%9%1!<%WJ8;z$O!"$D$M$K2~9T$ND>8e$KMh$J$1$l$PFCJL$JJ8;z$H$O(B
@@ -877,7 +881,7 @@
 .Pp
 $B8=:_%5%]!<%H$5$l$F$$$k%(%9%1!<%W5!G=(B
 ($B%(%9%1!<%WJ8;z$O%G%U%)%k%H$N(B
-.Ql ~ 
+.Ql ~
 $B$H2>Dj$7$^$9(B) :
 .Bl -tag -width Ds
 .It Cm ~.
@@ -912,7 +916,7 @@
 $B%j%b!<%HB&$N%]!<%HE>Aw$rCf;_$9$k$3$H$b2DG=$G$9!#(B
 .Ic !\& Ns Ar command
 $B$r;H$&$H!"(B
-.Xr ssh_config 5 
+.Xr ssh_config 5
 $B$N(B
 .Ic PermitLocalCommand
 $B@_Dj9`L\$,5v2D$5$l$F$$$k>l9g!"%f!<%6$O(B
@@ -921,24 +925,24 @@
 .Fl h
 $B%*%W%7%g%s$r;H$C$F$/$@$5$$!#(B
 .It Cm ~R
-$B$=$N@\B3$N(B rekeying $B$rMW5a$7$^$9(B 
+$B$=$N@\B3$N(B rekeying $B$rMW5a$7$^$9(B
 (SSH $B%W%m%H%3%k(B $B%P!<%8%g%s(B 2 $B$G!"(B
 $B$J$*$+$DAj<j$,$3$l$r%5%]!<%H$7$F$$$k$H$-$N$_M-8z(B)$B!#(B
 .El
 .Sh TCP $BE>Aw(B
-$B0BA4$JDL?.O)$r$D$+$C$?G$0U$N(B TCP/IP $B@\B3$X$NE>Aw$O!"(B
+$B0BA4$JDL?.O)$r;H$C$?G$0U$N(B TCP/IP $B@\B3$X$NE>Aw$O!"(B
 $B%3%^%s%I%i%$%s$"$k$$$O@_Dj%U%!%$%k$G;XDj$7$^$9!#(B
 TCP $BE>Aw$N1~MQ$H$7$F!"%a!<%k%5!<%P$X$N0BA4$J(B
 $B@\B3$,9M$($i$l$^$9!#$[$+$K$b%U%!%$%d!<%&%)!<%k$r(B
 $B$^$?$$$GDL?.$9$k$J$I$N;H$$$_$A$,$"$k$G$7$g$&!#(B
 .Pp
-$B0J2<$NNc$G$O!"(BIRC$B%/%i%$%"%s%H$H%5!<%P$NDL?.$r(B
+$B0J2<$NNc$G$O!"(BIRC $B%/%i%$%"%s%H$H%5!<%P$NDL?.$r(B
 $B0E9f2=$9$kJ}K!$r>R2p$7$^$9!#$?$H$((B IRC $B%5!<%P$,(B
 $B0E9f2=$rD>@\%5%]!<%H$7$F$$$J$/$F$b!"(B
 $BDL?.$r0E9f2=$9$k$3$H$,$G$-$^$9!#(B
 $B$3$l$O0J2<$N$h$&$K$7$FF0:n$7$^$9(B:
 $B$^$:!"%f!<%6$,%j%b!<%H%[%9%H$K(B
-.Nm 
+.Nm
 $B$G@\B3$7!"%j%b!<%H$N%5!<%P$K@\B3$rE>Aw$9$k$?$a$K;H$&(B
 $B%]!<%HHV9f$r;XDj$7$^$9!#$3$N$"$H!"%/%i%$%"%s%H%^%7%s>e$G(B
 $B0E9f2=$N%5!<%S%9$r3+;O$7!"%m!<%+%k$JF1$8%]!<%H$K@\B3$9$k$H!"(B
@@ -950,7 +954,7 @@
 .Dq 127.0.0.1
 (localhost)
 $B$+$i%j%b!<%H$N%5!<%P(B
-.Dq server.example.com 
+.Dq server.example.com
 $B$X$H%H%s%M%j%s%0$7$^$9(B:
 .Bd -literal -offset 4n
 $ ssh -f -L 1234:localhost:6667 server.example.com sleep 10
@@ -958,13 +962,13 @@
 .Ed
 .Pp
 $B$3$l$O%]!<%H(B 1234 $B$r;H$C$F(B IRC $B%5!<%P(B
-.Dq server.example.com 
+.Dq server.example.com
 $B$X$N@\B3$r%H%s%M%j%s%0$7!"%K%C%/%M!<%`(B
-.Dq pinky 
+.Dq pinky
 $B$G(B
-.Dq #users 
+.Dq #users
 $B%A%c%s%M%k$K(B join $B$7$^$9!#(B
-$B%]!<%HHV9f$O!"(B1024$B0J>e$G$"$j(B
+$B%]!<%HHV9f$O!"(B1024 $B0J>e$G$"$j(B
 ($BFC8"%]!<%H$r;HMQ$G$-$k$N$O(B root $B$@$1$G$9(B)$B!"(B
 $BB>$N%]!<%H$H$+$A9g$o$J$1$l$P$I$3$G$b$+$^$$$^$;$s!#(B
 $B$3$N@\B3$O%j%b!<%H%5!<%P>e$N%]!<%H(B 6667 $B$KE>Aw$5$l$^$9!#(B
@@ -977,7 +981,7 @@
 $B%j%b!<%H%3%^%s%I(B
 .Dq sleep 10
 $B$O%H%s%M%j%s%0$9$k%5!<%S%9$,3+;O$5$l$k$^$G$K(B
-$B0lDj$N;~4V(B ($B$3$NNc$G$O(B 10$BIC(B) $B$rM?$($F$$$^$9!#(B
+$B0lDj$N;~4V(B ($B$3$NNc$G$O(B 10 $BIC(B) $B$rM?$($F$$$^$9!#(B
 $B$b$7$3$3$G;XDj$5$l$?;~4VFb$K@\B3$,9T$o$l$J$$>l9g!"(B
 .Nm
 $B$O=*N;$9$k$G$7$g$&!#(B
@@ -1012,7 +1016,7 @@
 .Nm
 $B$O0E9f2=$5$l$?DL?.O)$r2p$7$F@\B3$rE>Aw$7$^$9!#(B
 $B$=$N$?$a!"%5!<%P%^%7%s>e$K(B X $B%5!<%P$N(B
-.Dq $B%W%m%-%7!<(B
+.Dq $B%W%m%-%7(B
 $B$r$D$/$k$N$G$3$&$J$k$N$G$9!#(B
 .Pp
 $B$^$?!"(B
@@ -1024,7 +1028,7 @@
 $B$9$Y$F$3$N%/%C%-!<$r;}$?$;$k$h$&$K$7$^$9!#(B
 $B$=$7$F@\B3$,3+$+$l$k$H$-$K!"$3$l$,K\J*$N%/%C%-!<$HCV$-49$o$k(B
 $B$h$&$K$9$k$N$G$9!#K\J*$NG'>Z%/%C%-!<$,%5!<%PB&$K(B
-$BAw$i$l$k$3$H$O7h$7$F$"$j$^$;$s(B 
+$BAw$i$l$k$3$H$O7h$7$F$"$j$^$;$s(B
 ($B$7!"0E9f2=$5$l$J$$$^$^$G%/%C%-!<$,Aw$i$l$k$3$H$b$"$j$^$;$s(B)$B!#(B
 .Pp
 .Cm ForwardAgent
@@ -1044,7 +1048,7 @@
 $B@_Dj9`L\$G6X;_$5$l$F$$$J$$8B$j(B)
 $B%f!<%6$K$O$=$N%5!<%P$N8x3+80$N;XLf(B (fingerprint) $B$,(B
 $BDs<($5$l$^$9!#;XLf$O(B
-.Xr ssh-keygen 1 
+.Xr ssh-keygen 1
 $B%3%^%s%I$K$h$C$FF@$k$3$H$,$G$-$^$9(B:
 .Pp
 .Dl $ ssh-keygen -l -f /etc/ssh/ssh_host_rsa_key
@@ -1059,7 +1063,7 @@
 $B>H9g$9$k$3$H$,$G$-$^$9!#(B
 .Pp
 $B0J2<$NNc$G$O!"$"$k%/%i%$%"%s%H$,%5!<%P(B
-.Dq host.example.com 
+.Dq host.example.com
 $B$K@\B3$9$k$b$N$H$7$^$9!#$^$:(B
 SSHFP $B;q8;%l%3!<%I$r(B host.example.com $B$N(B zone $B%U%!%$%k$K(B
 $BDI2C$9$kI,MW$,$"$j$^$9(B:
@@ -1086,13 +1090,13 @@
 $B$N(B
 .Cm VerifyHostKeyDNS
 $B@_Dj9`L\$r;2>H$7$F$/$@$5$$!#(B
-.Sh SSH$B$r$D$+$C$?2>A[%W%i%$%Y!<%H%M%C%H%o!<%/(B (VPN)
+.Sh SSH$B$r;H$C$?2>A[%W%i%$%Y!<%H%M%C%H%o!<%/(B (VPN)
 .Nm
 $B$O!"2>A[%M%C%H%o!<%/%G%P%$%9$G$"$k(B
 .Xr tun 4
 $B$r;H$C$?!"2>A[%W%i%$%Y!<%H%M%C%H%o!<%/(B (VPN) $B$N(B
 $B%H%s%M%j%s%0$r%5%]!<%H$7$F$$$^$9!#(B
-$B$3$l$K$h$j!"0[$J$k(B 2$B$D$N%M%C%H%o!<%/$r(B
+$B$3$l$K$h$j!"0[$J$k(B 2 $B$D$N%M%C%H%o!<%/$r(B
 $B0BA4$K7k9g$9$k$3$H$,$G$-$^$9!#(B
 .Xr sshd_config 5
 $B%U%!%$%k$K$"$k(B
@@ -1102,11 +1106,11 @@
 $B$*$h$S%5%]!<%H$9$k%l%Y%k(B ($B%l%$%d(B 2 $B$"$k$$$O%l%$%d(B 3)
 $B$r;XDj$7$^$9!#(B
 .Pp
-$B0J2<$NNc$G$O!"(BSSH$B%5!<%P$,%j%b!<%H$N%M%C%H%o!<%/$N(B
+$B0J2<$NNc$G$O!"(BSSH $B%5!<%P$,%j%b!<%H$N%M%C%H%o!<%/$N(B
 $B%2!<%H%&%'%$$H$7$F(B 192.168.1.15 $B$GF0$$$F$$$k$H2>Dj$7$?>l9g$K(B
 $B%/%i%$%"%s%HB&$N%M%C%H%o!<%/(B 10.0.50.0/24 $B$H!"(B
 $B%j%b!<%HB&$N%M%C%H%o!<%/(B 10.0.99.0/24 $B$H$r!"(B
-10.1.1.1 $B$+$i(B 10.1.1.2 $B$X$N(B point-to-point $B@\B3$r$D$+$C$F7k9g$7$^$9!#(B
+10.1.1.1 $B$+$i(B 10.1.1.2 $B$X$N(B point-to-point $B@\B3$r;H$C$F7k9g$7$^$9!#(B
 $B$3$N$H$-%j%b!<%HB&%M%C%H%o!<%/$N%2!<%H%&%'%$$G$O(B 192.168.1.15 $B$G(B
 SSH $B%5!<%P$,Av$C$F$*$j!"$3$N@\B3$r5v2D$7$F$$$k$b$N$H$7$^$9!#(B
 .Pp
@@ -1131,12 +1135,12 @@
 $B0J2<$N%(%s%H%j$O!"(B
 .Cm PermitRootLogin
 $B9`L\$,(B
-.Dq forced-commands-only 
+.Dq forced-commands-only
 $B$K@_Dj$5$l$F$$$k>l9g$N$b$N$G!"%f!<%6(B jane $B$KBP$7$F$O(B
 .Xr tun 4
 $B%G%P%$%9(B 1$BHV(B $B$X$N@\B3$r5v2D$7!"(B
 $B%f!<%6(B john $B$KBP$7$F$O(B
-tun $B%G%P%$%9(B 2$BHV(B $B$X$N@\B3$r5v2D$7$^$9(B:
+tun $B%G%P%$%9(B 2 $BHV(B $B$X$N@\B3$r5v2D$7$^$9(B:
 .Bd -literal -offset 2n
 tunnel="1",command="sh /etc/netstart tun1" ssh-rsa ... jane
 tunnel="2",command="sh /etc/netstart tun2" ssh-rsa ... john
@@ -1148,7 +1152,7 @@
 $B$h$jD94|E*$J(B VPN $B@\B3$O!"(B
 .Xr ipsecctl 8
 $B$d(B
-.Xr isakmpd 8 
+.Xr isakmpd 8
 $B$H$$$C$?%D!<%k$r;H$&$[$&$,M%$l$F$$$^$9!#(B
 .Sh $B4D6-JQ?t(B
 .Nm
@@ -1190,7 +1194,7 @@
 .Nm
 $B$N%3%s%Q%$%k;~$K;XDj$5$l$^$9!#(B
 .It Ev SSH_ASKPASS
-$B%Q%9%U%l!<%:$rF~NO$9$k$5$$!"(B
+$B%Q%9%U%l!<%:$rF~NO$9$k:]!"(B
 .Nm
 $B$,C<Kv$+$i5/F0$5$l$F$$$k$H(B
 .Nm
@@ -1204,10 +1208,10 @@
 .Nm
 $B$O(B
 .Ev SSH_ASKPASS
-$B$K$h$C$F;XDj$5$l$k%W%m%0%i%`$r5/F0$7!"(BX11 $B%&%$%s%I%&$r;H$C$F(B
+$B$K$h$C$F;XDj$5$l$k%W%m%0%i%`$r5/F0$7!"(BX11 $B%&%#%s%I%&$r;H$C$F(B
 $B%Q%9%U%l!<%:$rMW5a$7$^$9!#(B
 $B$3$l$O(B
-.Nm 
+.Nm
 $B$r(B
 .Pa .xsession
 $B$d$=$l$KN`$9$k%9%/%j%W%H$+$i8F$S=P$9:]$K$H$/$KLr$KN)$A$^$9!#(B
@@ -1217,12 +1221,12 @@
 $B$K%j%@%$%l%/%H$9$kI,MW$,$"$k$+$b$7$l$^$;$s(B)
 .It Ev SSH_AUTH_SOCK
 $BG'>Z%(!<%8%'%s%H$HDL?.$9$k$N$K;H$o$l$k(B
-.Ux Ns -domain
+.Ux
 $B%I%a%$%s%=%1%C%H$N(B
 $B%Q%9$rI=$7$F$$$^$9!#(B
 .It Ev SSH_CONNECTION
 $B@\B3$NN>C<$K$"$k%/%i%$%"%s%H$H%5!<%P$N<1JL;R$G$9!#(B
-$B$3$NJQ?t$K$O%9%Z!<%9$G6h@Z$i$l$?(B 4$B$D$NCM$,F~$C$F$$$^$9(B:
+$B$3$NJQ?t$K$O%9%Z!<%9$G6h@Z$i$l$?(B 4 $B$D$NCM$,F~$C$F$$$^$9(B:
 $B%/%i%$%"%s%H$N(B IP $B%"%I%l%9!"%/%i%$%"%s%H$N%]!<%H!"(B
 $B%5!<%P$N(B IP $B%"%I%l%9(B $B$*$h$S(B $B%5!<%P$N%]!<%H$G$9!#(B
 .It Ev SSH_ORIGINAL_COMMAND
@@ -1256,7 +1260,7 @@
 .Sh $B4XO"%U%!%$%k(B
 .Bl -tag -width Ds -compact
 .It ~/.rhosts
-$B$3$N%U%!%$%k$O%[%9%H%Y!<%9%IG'>Z(B 
+$B$3$N%U%!%$%k$O%[%9%H%Y!<%9%IG'>Z(B
 (host-based authentication$B!">e5-;2>H(B) $B$G;H$o$l$^$9!#(B
 $B%f!<%6$N%[!<%`%G%#%l%/%H%j$,(B NFS $B%Q!<%F%#%7%g%s>e$K$"$k$h$&$J(B
 $B%^%7%s$G$O!"$3$N%U%!%$%k$OC/$K$G$bFI$_9~$_(B
@@ -1341,7 +1345,7 @@
 $B$N%^%K%e%"%k$r8+$F$/$@$5$$!#(B
 .Pp
 .It /etc/hosts.equiv
-$B$3$N%U%!%$%k$O%[%9%H%Y!<%9%IG'>Z(B 
+$B$3$N%U%!%$%k$O%[%9%H%Y!<%9%IG'>Z(B
 (host-based authentication$B!">e5-;2>H(B) $B$G;H$o$l$^$9!#(B
 $B$3$N%U%!%$%k$O(B root $B$@$1$,=q$-9~$a$k$h$&$K$7$F$*$/$Y$-$G$9!#(B
 .Pp
@@ -1362,7 +1366,7 @@
 .It /etc/ssh/ssh_host_key
 .It /etc/ssh/ssh_host_dsa_key
 .It /etc/ssh/ssh_host_rsa_key
-$B$3$l$i(B 3$B$D$N%U%!%$%k$K$O%[%9%HHkL)80$,3JG<$5$l$F$$$^$9!#(B
+$B$3$l$i(B 3 $B$D$N%U%!%$%k$K$O%[%9%HHkL)80$,3JG<$5$l$F$$$^$9!#(B
 $B$3$l$i$O!"%[%9%H%Y!<%9$NG'>Z$K;H$o$l$^$9!#(B
 $B%W%m%H%3%k(B $B%P!<%8%g%s(B 1 $B$r;H$&>l9g!"(B
 $B%[%9%H80$O(B root $B$K$7$+FI$a$J$$$N$G(B
@@ -1470,7 +1474,7 @@
 OpenSSH $B$O(B Tatu Ylonen $B$K$h$k!"%U%j!<$J(B
 $B%*%j%8%J%kHG(B ssh 1.2.12 $B%j%j!<%9$+$iGI@8$7$?$b$N$G$9!#(B
 Aaron Campbell$B!"(B Bob Beck$B!"(B Markus Friedl$B!"(B Niels Provos$B!"(B
-Theo de Raadt $B$*$h$S(B Dug Song $B$,B?$/$N%P%0$r$H$j=|$-!"(B
+Theo de Raadt $B$*$h$S(B Dug Song $B$,B?$/$N%P%0$r<h$j=|$-!"(B
 $B?7$7$$5!G=$r$U$?$?$SDI2C$7$F(B OpenSSH $B$r$D$/$j$^$7$?!#(B
 SSH $B%W%m%H%3%k(B $B%P!<%8%g%s(B 1.5 $B$*$h$S(B 2.0 $B$N%5%]!<%H$O(B
 Markus Friedl $B$N9W8%$K$h$k$b$N$G$9!#(B
--- ssh_config.5.orig	Tue Oct  3 17:28:38 2006
+++ ssh_config.5	Mon Nov 27 22:56:47 2006
@@ -39,10 +39,13 @@
 .\" Japanese translation: $Id: ssh_config.5,v 1.14 2006/05/29 07:13:23 yusuke Exp $
 .\" by Yusuke Shinyama <yusuke @ cs . nyu . edu>
 .\"
+.\" %FreeBSD: src/crypto/openssh/ssh_config.5,v 1.17.2.4 2006/11/11 00:51:28 des Exp %
+.\" $FreeBSD$
+.\"
 .Dd September 25, 1999
 .Dt SSH_CONFIG 5
 .Os
-.Sh $BL>A0(B
+.Sh $BL>>N(B
 .Nm ssh_config
 .Nd OpenSSH SSH $B%/%i%$%"%s%H(B $B@_Dj%U%!%$%k(B
 .Sh $B=q<0(B
@@ -50,7 +53,7 @@
 .It Pa ~/.ssh/config
 .It Pa /etc/ssh/ssh_config
 .El
-.Sh $B@bL@(B
+.Sh $B2r@b(B
 .Xr ssh 1
 $B$O0J2<$N$b$N$+$i(B ($B$3$N=g=x$G(B) $B@_Dj>pJs$r<hF@$7$^$9(B:
 .Pp
@@ -65,7 +68,7 @@
 .Pq Pa /etc/ssh/ssh_config
 .El
 .Pp
-$B3F@_Dj9`L\$K$O$=$l$=$l:G=i$K8+$D$+$C$?$b$N$,;H$o$l$^$9!#(B
+$B3F@_Dj9`L\$K$O$=$l$>$l:G=i$K8+$D$+$C$?$b$N$,;H$o$l$^$9!#(B
 $B@_Dj%U%!%$%k$O$$$/$D$+$N%;%/%7%g%s$KJ,$+$l$F$*$j!"$3$l$i$O(B
 .Dq Host
 $B%-!<%o!<%I$K$h$j6h@Z$i$l$F$$$^$9!#$"$k%;%/%7%g%s$N@_Dj$,(B
@@ -100,7 +103,7 @@
 .Pq \&"
 $B$G0O$s$GI=8=$9$k$3$H$b$G$-$^$9!#(B
 .Pp
-$B$H$j$&$k%-!<%o!<%I$H$=$N0UL#$O0J2<$N$H$*$j$G$9(B 
+$B$H$j$&$k%-!<%o!<%I$H$=$N0UL#$O0J2<$N$H$*$j$G$9(B
 ($B%-!<%o!<%I$OBgJ8;z>.J8;z$I$A$i$G$b$+$^$$$^$;$s$,!"(B
 $B$=$N0z?t$OBgJ8;z>.J8;z$,6hJL$5$l$k$3$H$KCm0U$7$F$/$@$5$$(B) :
 .Bl -tag -width Ds
@@ -133,7 +136,7 @@
 $B$K@_Dj$5$l$F$$$k$H!"%Q%9%U%l!<%:$*$h$S%Q%9%o!<%I$N(B
 $BF~NO$r5a$a$J$$$h$&$K$J$j$^$9!#$3$N@_Dj9`L\$O%9%/%j%W%H$J$I$K$*$1$k(B
 $B%P%C%A=hM}Cf$G!"%Q%9%o!<%I$rBG$A9~$`%f!<%6$,$$$J$$>l9g$KJXMx$G$9!#(B
-$B0z?t$NCM$O(B 
+$B0z?t$NCM$O(B
 .Dq yes
 $B$"$k$$$O(B
 .Dq no
@@ -172,12 +175,12 @@
 .Dq no
 $B$K@_Dj$5$l$F$$$k>l9g$O!"$3$N8!::$O$*$3$J$o$l$^$;$s!#(B
 $B%G%U%)%k%H$G$O!"$3$l$O(B
-.Dq yes ($B%[%9%H(B IP $B%"%I%l%9$N8!::$r$*$3$J$&(B)
+.Dq no ($B%[%9%H(B IP $B%"%I%l%9$N8!::$r$*$3$J$o$J$$(B)
 $B$K$J$C$F$$$^$9!#(B
 .It Cm Cipher ($B0E9fJ}<0(B)
 $B%W%m%H%3%k(B $B%P!<%8%g%s(B 1 $B$N%;%C%7%g%s$G;H$&(B
 $B0E9fJ}<0$r;XDj$7$^$9!#8=:_$N$H$3$m(B
-.Dq blowfish 
+.Dq blowfish
 .Dq 3des
 $B$*$h$S(B
 .Dq des
@@ -189,10 +192,10 @@
 .Ar 3des
 $B0E9f$r%5%]!<%H$7$F$$$J$$!"$b$O$d8E$/$J$C$?%W%m%H%3%k(B 1 $B$N<BAu$H(B
 $BAj8_1?MQ$9$k$?$a$K$N$_%5%]!<%H$5$l$F$$$^$9!#(B
-$B=c?h$J(Bdes$B0E9f$O<e$$$?$a!";HMQ$O$*$9$9$a$7$^$;$s!#(B
+$B=c?h$J(B des $B0E9f$O<e$$$?$a!";HMQ$O$*$9$9$a$7$^$;$s!#(B
 .It Cm Ciphers ($BJ#?t$N0E9fJ}<0(B)
 $B%W%m%H%3%k(B $B%P!<%8%g%s(B 2 $B$G;H$&0E9fJ}<0$N(B
-$BM%@h=g0L$r;XDj$7$^$9!#J#?t$N0E9fJ}<0$r%+%s%^$G6h@Z$C$F;XDj$7$^$9!#(B
+$BM%@h=g0L$r;XDj$7$^$9!#J#?t$N0E9fJ}<0$r%3%s%^$G6h@Z$C$F;XDj$7$^$9!#(B
 $B8=:_$N$H$3$m!"%5%]!<%H$5$l$F$$$k0E9fJ}<0$O0J2<$N$H$*$j$G$9(B:
 .Dq 3des-cbc ,
 .Dq aes128-cbc ,
@@ -242,7 +245,7 @@
 .Dq no ($B05=L$r$*$3$J$o$J$$(B)
 $B$K$J$C$F$$$^$9!#(B
 .It Cm CompressionLevel ($B05=L%l%Y%k(B)
-$B05=L$r$*$3$J$&$5$$$N05=L%l%Y%k$r;XDj$7$^$9!#(B
+$B05=L$r$*$3$J$&:]$N05=L%l%Y%k$r;XDj$7$^$9!#(B
 $B$3$N0z?t$,$H$kCM$O(B
 $B@0?t$N(B 1 ($BB.$$(B) $B$+$i(B 9 ($BCY$$!"9b05=LN((B) $B$^$G$G$9!#(B
 $B%G%U%)%k%H$NCM$O(B 6 $B$G!"$[$H$s$I$N%"%W%j%1!<%7%g%s$K$O$3$l$G=<J,$G$9!#(B
@@ -252,11 +255,11 @@
 $B$3$N9`L\$O%W%m%H%3%k(B $B%P!<%8%g%s(B 1 $B$K$N$_E,MQ$5$l$k$3$H$K(B
 $BCm0U$7$F$/$@$5$$!#(B
 .It Cm ConnectionAttempts ($B@\B3;n9T2s?t(B)
-$B@\B3$r;n$_$k2s?t(B (1$BIC$K0l2s(B) $B$r;XDj$7$^$9!#$3$l$r1[$($k$H(B
+$B@\B3$r;n$_$k2s?t(B (1 $BIC$K(B 1 $B2s(B) $B$r;XDj$7$^$9!#$3$l$r1[$($k$H(B
 ssh $B$O=*N;$7$F$7$^$$$^$9!#$3$NCM$O@0?t$G(B
 $B$J$1$l$P$J$j$^$;$s!#$3$l$O!"$H$-$I$-@\B3$K<:GT$9$k4D6-$G$N(B
 $B%9%/%j%W%H$J$I$KJXMx$G$9!#(B
-$B%G%U%)%k%H$O(B 1$B2s$G$9!#(B
+$B%G%U%)%k%H$O(B 1 $B2s$G$9!#(B
 .It Cm ConnectTimeout ($B@\B3%?%$%`%"%&%H(B)
 SSH $B%5!<%P$K@\B3$9$k$H$-$N%?%$%`%"%&%H;~4V$rIC?t$G;XDj$7$^$9!#(B
 $B%G%U%)%k%H$N(B TCP $B%?%$%`%"%&%H;~4V$KBe$o$C$F$3$NCM$,;H$o$l$^$9!#(B
@@ -279,13 +282,13 @@
 .Dq no
 $B$r;XDj$7$^$9(B ($B$3$l$,%G%U%)%k%H(B)$B!#(B
 $B$3$&$9$k$H!"$=$N%;%C%7%g%s$O?7$?$K%M%C%H%o!<%/@\B3$9$k$N$G$O$J$/!"(B
-$B$9$G$K$"$k(B Master $B%$%s%?!<%U%'%$%9$N%M%C%H%o!<%/@\B3$N:FMxMQ$r;n$_$k$h$&$K$J$j$^$9!#(B
+$B$9$G$K$"$k(B Master $B%$%s%?%U%'!<%9$N%M%C%H%o!<%/@\B3$N:FMxMQ$r;n$_$k$h$&$K$J$j$^$9!#(B
 $B$?$@$7@)8fMQ%=%1%C%H$,B8:_$7$J$$$+!"(Blisten $B$5$l$F$$$J$$>l9g$ODL>o$N@\B3$K$J$j$^$9!#(B
 .Pp
 $B$3$NCM$r(B
 .Dq ask
 $B$K;XDj$9$k$H!"(B
-ssh $B$O@)8fMQ$N%=%1%C%H$r(B listen $B$7$^$9$,!"$3$l$r<u$1$D$1$k$5$$$K(B
+ssh $B$O@)8fMQ$N%=%1%C%H$r(B listen $B$7$^$9$,!"$3$l$r<u$1$D$1$k:]$K(B
 .Ev SSH_ASKPASS
 $B%W%m%0%i%`$K$h$k3NG'$rMW5a$7$^$9(B
 ($B>\:Y$O(B
@@ -302,10 +305,10 @@
 $B=jB0$7$F$$$k$b$N$K$J$j$^$9!#$D$^$j!"J#?t$N%G%#%9%W%l%$$d%(!<%8%'%s%H$r(B
 $BE>Aw$9$k$3$H$O$G$-$^$;$s!#(B
 .Pp
-$B$3$N$[$+$K!"%*%W%7%g%s$H$7$F$5$i$K(B 2$B<oN`$NJ}<0$,;XDj$G$-$^$9!#(B
+$B$3$N$[$+$K!"%*%W%7%g%s$H$7$F$5$i$K(B 2 $B<oN`$NJ}<0$,;XDj$G$-$^$9!#(B
 .Dq auto
 $B$^$?$O(B
-.Dq autoask 
+.Dq autoask
 $B$r;H$&$H!"$3$l$i$O(B Master $B@\B3$,MxMQ$G$-$J$$$H$-$K!"(B
 $B<+F0E*$K?7$7$$@\B3$r:n$j$^$9(B (opportunistic multiplexing)$B!#(B
 $B$3$N>l9g!"8e<T$O(B
@@ -314,7 +317,7 @@
 .It Cm ControlPath ($B@)8fMQ%Q%9L>(B)
 $B>e$N(B
 .Cm ControlMaster
-$B9`L\$G@bL@$5$l$F$$$k!"%M%C%H%o!<%/@\B3$r6&M-$9$k$5$$$N@)8fMQ%=%1%C%H$N%Q%9L>$r;XDj$7$^$9!#(B
+$B9`L\$G@bL@$5$l$F$$$k!"%M%C%H%o!<%/@\B3$r6&M-$9$k:]$N@)8fMQ%=%1%C%H$N%Q%9L>$r;XDj$7$^$9!#(B
 $B@\B3$N6&M-$r6X;_$9$k>l9g$O(B
 .Dq none
 $B$r;XDj$7$F$/$@$5$$!#(B
@@ -345,7 +348,7 @@
 $B$N7A<0$G$9!#(B
 IPv6 $B%"%I%l%9$O3Q%+%C%3$G0O$`$+!"$3$l$H$OJL$N7A<0$G;XDj$7$^$9(B:
 .Oo Ar bind$B$9$k%"%I%l%9(B Ns / Oc Ns Ar $B%]!<%H(B
-$B%G%U%)%k%H$G$O!"%m!<%+%k$N%]!<%H$O(B 
+$B%G%U%)%k%H$G$O!"%m!<%+%k$N%]!<%H$O(B
 .Cm GatewayPorts
 $B$N@_Dj$K$7$?$,$C$F(B bind $B$5$l$^$9$,!"(B
 .Ar bind$B$9$k%"%I%l%9(B
@@ -356,7 +359,7 @@
 $B$K$9$k$H!"(Blisten $B$9$k%]!<%H$O%m!<%+%k@lMQ$K$J$j!"(B
 $B%"%I%l%9$r;XDj$7$J$$$+(B
 .Sq *
-$B$K$9$k$H!"%]!<%H$O$9$Y$F$N%M%C%H%o!<%/%$%s%?!<%U%'%$%9$G;HMQ2DG=$K$J$j$^$9!#(B
+$B$K$9$k$H!"%]!<%H$O$9$Y$F$N%M%C%H%o!<%/%$%s%?%U%'!<%9$G;HMQ2DG=$K$J$j$^$9!#(B
 .Pp
 $B:#$N$H$3$m(B SOCKS4 $B$*$h$S(B SOCKS5 $B%W%m%H%3%k$,;H$o$l$F$*$j!"(B
 .Xr ssh 1
@@ -370,15 +373,15 @@
 .Dq yes
 $B$K@_Dj$9$k$H!"(B
 .Cm HostbasedAuthentication
-$B$N$5$$$K(B
+$B$N:]$K(B
 .Xr ssh-keysign 8
 $B$N;HMQ$,5v2D$5$l$^$9!#(B
 $B0z?t$NCM$O(B
 .Dq yes
 $B$"$k$$$O(B
-.Dq no 
+.Dq no
 $B$G$9!#%G%U%)%k%H$O(B
-.Dq no 
+.Dq no
 $B$K$J$C$F$$$^$9!#(B
 $B$3$N9`L\$O%[%9%H$K0MB8$7$J$$ItJ,$K5-=R$9$Y$-$G$9!#(B
 $B>\$7$/$O(B
@@ -386,16 +389,16 @@
 $B$r;2>H$7$F$/$@$5$$!#(B
 .It Cm EscapeChar ($B%(%9%1!<%WJ8;z(B)
 $B%(%9%1!<%WJ8;z$r@_Dj$7$^$9(B ($B%G%U%)%k%H$O(B
-.Ql \&~ 
+.Ql \&~
 )$B!#%(%9%1!<%WJ8;z$O%3%^%s%I%i%$%s$+$i$b;XDj$G$-$^$9!#(B
-$B$3$N0z?t$K$O(B 1$B$D$NJ8;z$+!"(B
+$B$3$N0z?t$K$O(B 1 $B$D$NJ8;z$+!"(B
 .Ql \&^
-$B$K(B1$BJ8;z$rIU$1$?$b$N!"$"$k$$$O%(%9%1!<%WJ8;z$N;HMQ$r$9$Y$F6X;_$9$k$J$i(B
+$B$K(B 1 $BJ8;z$rIU$1$?$b$N!"$"$k$$$O%(%9%1!<%WJ8;z$N;HMQ$r$9$Y$F6X;_$9$k$J$i(B
 .Dq none
 $B$r;XDj$7$^$9(B ($B$3$l$O$=$N@\B3$r!"%P%$%J%j(B
 $B%G!<%?$KBP$7$FF)2a$K$9$k$3$H$K$J$j$^$9(B)$B!#(B
 .It Cm ExitOnForwardFailure ($BE>Aw$G$-$J$$>l9g$K=*N;(B)
-$BMW5a$5$l$?(B ($B%m!<%+%k!"%j%b!<%H!"$"$k$$$O%@%$%J%_%C%/(B) 
+$BMW5a$5$l$?(B ($B%m!<%+%k!"%j%b!<%H!"$"$k$$$O%@%$%J%_%C%/(B)
 $B%]!<%HE>Aw$9$Y$F$r@_Dj$G$-$J$$>l9g$K!"(B
 .Xr ssh 1
 $B$r=*N;$9$Y$-$+$I$&$+$r;XDj$7$^$9!#0z?t$O(B
@@ -452,7 +455,7 @@
 $B?.Mj$5$l$?(B X11 $B%/%i%$%"%s%H$KB0$9$k%G!<%?$rEp$_8+$?$j2~cb$7$?$j$9$k$3$H$O$G$-$^$;$s!#(B
 $B$5$i$K!"$3$N%;%C%7%g%s$G;H$o$l$k(B
 .Xr xauth 1
-$B%H!<%/%s$O(B 20$BJ,8e$K4|8B$,@Z$l$k$h$&@_Dj$5$l$F$*$j!"(B
+$B%H!<%/%s$O(B 20 $BJ,8e$K4|8B$,@Z$l$k$h$&@_Dj$5$l$F$*$j!"(B
 $B%j%b!<%HB&$N%/%i%$%"%s%H$O!"$3$N;~4V$r2a$.$k$H%"%/%;%9$r5qH]$5$l$k$h$&$K$J$j$^$9!#(B
 .Pp
 $B%G%U%)%k%H$G$O(B
@@ -551,7 +554,7 @@
 .Cm HostName
 $B%-!<%o!<%I$NN>J}$H$b(B)$B!#(B
 .It Cm IdentitiesOnly ($B%U%!%$%k$K3JG<$5$l$?HkL)80$N$_$r;HMQ(B)
-$BG'>Z$N$5$$$K!"$?$H$(G'>Z%(!<%8%'%s%H(B
+$BG'>Z$N:]$K!"$?$H$(G'>Z%(!<%8%'%s%H(B
 .Xr ssh-agent 1
 $B$,J#?t$NHkL)80$r;}$C$F$$$?>l9g$G$b!"(B
 .Nm
@@ -596,7 +599,7 @@
 $B$3$N>l9g$9$Y$F$N(B identity $B$,=g$K;n$5$l$^$9!#(B
 .It Cm KbdInteractiveDevices ($B%-!<%\!<%IBPOC%G%P%$%9(B)
 keyboard-interactive $BG'>Z$G;H$o$l$kF~NOJ}K!$r;XDj$7$^$9!#(B
-$BJ#?t$NF~NOJ}K!$r;XDj$9$k>l9g$O!"%+%s%^$G6h@Z$C$F$/$@$5$$!#(B
+$BJ#?t$NF~NOJ}K!$r;XDj$9$k>l9g$O!"%3%s%^$G6h@Z$C$F$/$@$5$$!#(B
 $B%G%U%)%k%H$G$O%5!<%P$,Ds6!$7$?J}K!$N0lMw$r;HMQ$7$^$9!#(B
 $B$I$NJ}K!$,;HMQ$G$-$k$+$O!"%5!<%P$N%5%]!<%H$K$h$j$^$9!#(B
 OpenSSH $B%5!<%P$N>l9g!"$3$l$O0J2<$NAH$_9g$o$;$K$J$j$^$9(B:
@@ -621,7 +624,7 @@
 .Sm off
 .Oo Ar bind$B$9$k%"%I%l%9(B : Oc Ar $B%]!<%H(B
 .Sm on
-$B$G$"$j!"(B2$BHVL\$N0z?t$O(B
+$B$G$"$j!"(B2 $BHVL\$N0z?t$O(B
 .Ar $B%[%9%HL>(B : Ns Ar $B%[%9%HB&%]!<%H(B
 $B$G;XDj$7$^$9!#(B
 IPv6 $B%"%I%l%9$O3Q%+%C%3$G0O$`$+!"$3$l$H$OJL$N7A<0$G;XDj$7$^$9(B:
@@ -630,7 +633,7 @@
 .Ar $B%[%9%HL>(B Ns / Ns Ar $B%[%9%HB&%]!<%H(B
 $B%]!<%HE>Aw$OJ#?t;XDj$9$k$3$H$,$G$-!"(B
 $B%3%^%s%I%i%$%s$+$iDI2C;XDj$9$k$3$H$b$G$-$^$9!#(B
-$BFC8"%]!<%H$rE>Aw$G$-$k$N$O%9!<%Q!<%f!<%6$@$1$G$9!#(B
+$BFC8"%]!<%H$rE>Aw$G$-$k$N$O%9!<%Q%f!<%6$@$1$G$9!#(B
 $B%G%U%)%k%H$G$O!"%m!<%+%kB&$N%]!<%H$O(B
 .Cm GatewayPorts
 $B$N@_Dj$K=>$C$F(B bind $B$5$l$^$9$,!"(B
@@ -639,10 +642,10 @@
 .Ar bind$B$9$k%"%I%l%9(B
 $B$H$7$F(B
 .Dq localhost
-$B$r;XDj$9$k$H!"%]!<%H$r(B listen $B$9$k$N$O%m!<%+%k$J;HMQ$K$N$_8B$k$3$H$K$J$j$^$9!#(B
+$B$r;XDj$9$k$H!"%]!<%H$r(B listen $B$9$k$N$O%m!<%+%k$J;HMQ$N$_$K8B$k$3$H$K$J$j$^$9!#(B
 $B$$$C$]$&!"6u$N%"%I%l%9$^$?$O(B
 .Sq *
-$B$r;XDj$9$k$H!"$=$N%]!<%H$O$9$Y$F$N%$%s%?!<%U%'%$%9$KBP$7$F;HMQ2DG=$K$J$j$^$9!#(B
+$B$r;XDj$9$k$H!"$=$N%]!<%H$O$9$Y$F$N%$%s%?%U%'!<%9$KBP$7$F;HMQ2DG=$K$J$j$^$9!#(B
 .It Cm LogLevel ($B%m%0%l%Y%k(B)
 .Xr ssh 1
 $B$,=PNO$9$k%m%0$N>iD9@-$N%l%Y%k$r;XDj$7$^$9!#(B
@@ -655,15 +658,15 @@
 $B;HMQ$9$k(B MAC ($B%a%C%;!<%8G'>Z%3!<%I(B) $BJ}<0$NM%@h=g0L$r;XDj$7$^$9!#(B
 MAC $BJ}<0$O%W%m%H%3%k(B $B%P!<%8%g%s(B 2 $B$G;H$o$l$k!"(B
 $B%G!<%?$N2~cb$rKI$05!9=(B (data integrity protection) $B$G$9!#(B
-$BJ#?t$NJ}<0$r%+%s%^$G6h@Z$C$F;XDj$7$^$9!#(B
+$BJ#?t$NJ}<0$r%3%s%^$G6h@Z$C$F;XDj$7$^$9!#(B
 $B%G%U%)%k%H$O(B:
 .Dq hmac-md5,hmac-sha1,hmac-ripemd160,hmac-sha1-96,hmac-md5-96
 $B$N=g$K$J$C$F$$$^$9!#(B
 .It Cm NoHostAuthenticationForLocalhost (localhost$B$G$N%[%9%HG'>Z$rM^@)(B)
 $B$3$N9`L\$O%[!<%`%G%#%l%/%H%j$,%^%7%s4V$G6&M-$5$l$F$$$k$H$-$K(B
-$B;H$$$^$9!#$3$N$h$&$J>u67$G$O$=$l$>$lJL!9$N%^%7%s$G(B localhost $B$N$5$9(B
+$B;H$$$^$9!#$3$N$h$&$J>u67$G$O$=$l$>$lJL!9$N%^%7%s$G(B localhost $B$N;X$9(B
 $B%[%9%H$,0[$J$C$F$$$k$?$a!"%f!<%6$O%[%9%H80$,JQ$o$C$?$H$$$&7Y9p$r(B
-$B<u$1$F$7$^$$$^$9(B ($BLuCm(B: $BJL!9$N%[%9%H80$r$b$D%^%7%s$GF10l$N(B localhost 
+$B<u$1$F$7$^$$$^$9(B ($BLuCm(B: $BJL!9$N%[%9%H80$r$b$D%^%7%s$GF10l$N(B localhost
 $B%[%9%H80$,6&M-$5$l$F$$$k$?$a(B)$B!#$3$N9`L\$r;H$&$H!"Aj<j$,(B
 localhost $B$N$H$-$K$O%[%9%H4VG'>Z$rM^@)$9$k$3$H$,$G$-$^$9!#(B
 $B$3$N0z?t$,$H$j$&$kCM$O(B
@@ -705,9 +708,9 @@
 .It Cm PreferredAuthentications ($BG'>Z$NM%@h=g0L(B)
 $B%W%m%H%3%k(B 2 $B$G;n$5$l$kG'>Z$NM%@h=g0L$r;XDj$7$^$9!#(B
 $B$3$l$K$h$C$F!"%/%i%$%"%s%H$OFCDj$NG'>Z(B (
-.Cm keyboard-interactive 
+.Cm keyboard-interactive
 $B$J$I(B) $B$r$=$l0J30$NG'>Z(B (
-.Cm password 
+.Cm password
 $B$J$I(B) $B$h$j$bM%@h$7$FA*$V$3$H$,$G$-$^$9!#(B
 $B$3$N@_Dj9`L\$N%G%U%)%k%H$O(B
 .Do gssapi-with-mic ,
@@ -726,13 +729,13 @@
 .Sq 2
 $B$G$9!#(B
 $BJ#?t$N%P!<%8%g%s$r(B
-$B;XDj$9$k$H$-$O%+%s%^$G6h@Z$C$F$/$@$5$$!#(B
+$B;XDj$9$k$H$-$O%3%s%^$G6h@Z$C$F$/$@$5$$!#(B
 $B%G%U%)%k%HCM$O(B
 .Dq 2,1
 $B$G$9!#(B
 $B$3$l$O(B ssh $B$,$^$:;O$a$K%P!<%8%g%s(B 2 $B$,%5%]!<%H$5$l$F$$$k$+$I$&$+$rD4$Y!"(B
 $B%5!<%P$,$=$l$r%5%]!<%H$7$F$$$J$+$C$?>l9g$K(B
-$B%P!<%8%g%s(B 1 $B$r;HMQ$9$k$3$H$r;X<($7$F$$$^$9(B
+$B%P!<%8%g%s(B 1 $B$r;HMQ$9$k$3$H$r;X<($7$F$$$^$9!#(B
 ($BLuCm(B: $B$b$7%5!<%PB&$,%P!<%8%g%s(B 2 $B$NG'>Z$r%5%]!<%H$7$F$$$?>l9g!"(B
 $B%P!<%8%g%s(B 2 $B$G$NG'>Z$K<:GT$9$k$H(B ssh $B$O(B
 $B$=$3$G=*N;$7$^$9!#%P!<%8%g%s(B 1 $B$NG'>Z$O(B *$B$*$3$J$o$J$$(B* $B$?$a!"(B
@@ -805,7 +808,7 @@
 ($BLuCm(B: -R $B%*%W%7%g%s$HF1$8(B)$B!#(B
 $B:G=i$N0z?t$O(B
 .Oo Ar bind$B$9$k%"%I%l%9(B : Oc Ar $B%]!<%H(B
-$B$G$"$j!"(B2$BHVL\$N0z?t$O(B
+$B$G$"$j!"(B2 $BHVL\$N0z?t$O(B
 .Ar $B%[%9%HL>(B : Ns Ar $B%[%9%HB&%]!<%H(B
 $B$G;XDj$7$^$9!#(B
 IPv6 $B%"%I%l%9$O3Q%+%C%3$G0O$`$+!"$3$l$H$OJL$N7A<0$G;XDj$7$^$9(B:
@@ -814,10 +817,10 @@
 .Ar $B%[%9%HL>(B Ns / Ns Ar $B%[%9%HB&%]!<%H(B
 $B%]!<%HE>Aw$OJ#?t;XDj$9$k$3$H$,$G$-!"(B
 $B%3%^%s%I%i%$%s$+$iDI2C;XDj$9$k$3$H$b$G$-$^$9!#(B
-$BFC8"%]!<%H$rE>Aw$G$-$k$N$O%9!<%Q!<%f!<%6$@$1$G$9!#(B
+$BFC8"%]!<%H$rE>Aw$G$-$k$N$O%9!<%Q%f!<%6$@$1$G$9!#(B
 .Pp
 $B%G%U%)%k%H$G$O!"%5!<%PB&$G(B listen $B$9$k%=%1%C%H$O(B
-$B%k!<%W%P%C%/%$%s%?!<%U%'%$%9$K$N$_(B bind $B$5$l$^$9!#(B
+$B%k!<%W%P%C%/%$%s%?%U%'!<%9$K$N$_(B bind $B$5$l$^$9!#(B
 $B$3$l$O(B
 .Ar bind$B$9$k%"%I%l%9(B
 $B$r;XDj$9$k$3$H$K$h$C$F>e=q$-$9$k$3$H$,$G$-$^$9!#(B
@@ -826,7 +829,7 @@
 $B$^$?$O(B
 .Ql *
 $B$r%"%I%l%9$H$7$F;XDj$9$k$H!"%5!<%PB&$N%=%1%C%H$O(B
-$B$9$Y$F$N%$%s%?!<%U%'%$%9$KBP$7$F(B listen $B$9$k$h$&$K$J$j$^$9!#(B
+$B$9$Y$F$N%$%s%?%U%'!<%9$KBP$7$F(B listen $B$9$k$h$&$K$J$j$^$9!#(B
 .Ar bind$B$9$k%"%I%l%9(B
 $B$K%k!<%W%P%C%/0J30$NCM$,;XDj$G$-$k$N$O!"(B
 .Cm GatewayPorts
@@ -834,7 +837,7 @@
 .Xr sshd_config 5
 $B$r;2>H$7$F$/$@$5$$(B)$B!#(B
 .It Cm RhostsRSAAuthentication (rhosts-RSA $BG'>Z(B)
-RSA $B%[%9%HG'>Z$r;H$C$?(B Rhosts $B%Y!<%9$NG'>Z$r;n$_$k$+$I$&$+$r(B
+RSA $B%[%9%HG'>Z$r;H$C$?(B rhosts $B%Y!<%9$NG'>Z$r;n$_$k$+$I$&$+$r(B
 $B;XDj$7$^$9!#(B
 $B$3$N0z?t$NCM$O(B
 .Dq yes
@@ -905,7 +908,7 @@
 ($B2<5-(B) $B$,(B 15 $B$K@_Dj$5$l$F$*$j!"(B
 .Cm ServerAliveCountMax
 $B$,%G%U%)%k%H$N$^$^$@$C$?$H$7$?$i!"(Bssh $B$O(B
-$B%5!<%P$,1~Ez$7$J$/$J$C$?8e$*$h$=(B 45$BIC8e$K@\B3$r@ZCG$7$^$9!#(B
+$B%5!<%P$,1~Ez$7$J$/$J$C$?8e$*$h$=(B 45 $BIC8e$K@\B3$r@ZCG$7$^$9!#(B
 $B$3$N@_Dj9`L\$O%W%m%H%3%k(B $B%P!<%8%g%s(B 2 $B$K$N$_E,MQ$5$l$^$9!#(B
 .It Cm ServerAliveInterval ($B%5!<%P@8B83NG'$N4V3V(B)
 $B0lDj4|4V%5!<%P$+$i%G!<%?$,Aw$i$l$F$3$J$$$H$-$K!"(B
@@ -989,7 +992,7 @@
 .Dq ethernet
 (layer 2)
 $B$"$k$$$O(B
-.Dq no 
+.Dq no
 $B$G$9!#(B
 .Dq yes
 $B$r;XDj$9$k$H%G%U%)%k%H$N%H%s%M%j%s%0J}K!$H$7$F(B
@@ -1012,13 +1015,13 @@
 .Ar $B%m!<%+%k(Btun Op : Ar $B%j%b!<%H(Btun
 .Sm on
 $B$N7A$G$"$kI,MW$,$"$j$^$9!#(B
-$B%G%P%$%9L>$K$O%$%s%?!<%U%'%$%9HV9f$+!"%-!<%o!<%I(B
-.Dq any 
+$B%G%P%$%9L>$K$O%$%s%?%U%'!<%9HV9f$+!"%-!<%o!<%I(B
+.Dq any
 $B$r;XDj$7$^$9!#$3$l$r;XDj$9$k$H(B
 $B<!$K;HMQ2DG=$J%G%P%$%9$,A*Br$5$l$k$3$H$K$J$j$^$9!#(B
 .Ar $B%j%b!<%H(Btun
 $B$,;XDj$5$l$J$$>l9g!"$3$l$O(B
-.Dq any 
+.Dq any
 $B$H$_$J$5$l$^$9!#(B
 $B$3$N@_Dj9`L\$N%G%U%)%k%HCM$O(B
 .Dq any:any
@@ -1067,11 +1070,11 @@
 .Cm StrictHostKeyChecking
 $B@_Dj9`L\$K=>$C$F?7$7$$%[%9%H80$r3NG'$7$J$1$l$P$J$j$^$;$s!#(B
 $B$3$N@_Dj9`L\$,$H$j$&$kCM$O(B
-.Dq yes 
+.Dq yes
 $B!"(B
 .Dq no
 $B$"$k$$$O(B
-.Dq ask 
+.Dq ask
 $B$G$9!#%G%U%)%k%H$G$O(B
 .Dq no
 $B$K$J$C$F$$$^$9!#(B
@@ -1081,6 +1084,12 @@
 $B$N(B
 .Sx $B%[%9%H80$N8!>Z(B
 $B$b;2>H$7$F$/$@$5$$!#(B
+.It Cm VersionAddendum ($B%P!<%8%g%s$KIU2C$9$k$b$N(B)
+OS $B$b$7$/$O%5%$%H$KFC2=$7$?=$@5$r<($9$?$a$K!"DL>o$N%P!<%8%g%sJ8;zNs$K(B
+$BIU$12C$($kJ8;zNs$r;XDj$7$^$9!#(B
+$B%G%U%)%k%H$O(B
+.Dq FreeBSD-20061110
+$B$G$9!#(B
 .It Cm XAuthLocation (xauth $B$N0LCV(B)
 .Xr xauth 1
 $B%W%m%0%i%`$N%U%k%Q%9L>$r;XDj$7$^$9!#%G%U%)%k%H$O(B
@@ -1089,12 +1098,12 @@
 .El
 .Sh $B%Q%?!<%s(B
 .Em $B%Q%?!<%s(B
-$B$O!"(B0$B8D0J>e$NHs6uGrJ8;z$+!"(B
+$B$O!"(B0 $B8D0J>e$NHs6uGrJ8;z$+!"(B
 .Sq *
-(0$B8D$^$?$O0J>e$NG$0U$NJ8;z$K0lCW$9$k(B)
+(0 $B8D$^$?$O0J>e$NG$0U$NJ8;z$K0lCW$9$k(B)
 $B$"$k$$$O(B
 .Sq ?\&
-($BG$0U$N(B 1$BJ8;z$@$1$K0lCW$9$k(B)
+($BG$0U$N(B 1 $BJ8;z$@$1$K0lCW$9$k(B)
 $B$K$h$C$F9=@.$5$l$^$9!#$?$H$($P!"(B
 .Dq .co.uk
 $B%I%a%$%s$NG$0U$N%[%9%H$KE,MQ$5$l$k@k8@$r;XDj$7$?$$>l9g$K$O!"(B
@@ -1108,7 +1117,7 @@
 .Dl Host 192.168.0.?
 .Pp
 .Em $B%Q%?!<%sNs(B
-$B$O%+%s%^(B (,) $B$G6h@Z$i$l$?%Q%?!<%s$NNs$r$5$7$^$9!#(B
+$B$O%3%s%^(B (,) $B$G6h@Z$i$l$?%Q%?!<%s$NNs$r$5$7$^$9!#(B
 $B%Q%?!<%sNsCf$N3F%Q%?!<%s$O!"@hF,$K46C2Id(B
 .Pq Sq !\&
 $B$r$D$1$k$3$H$K$h$C$FH]Dj$rI=$9$3$H$,$G$-$^$9!#(B
@@ -1139,7 +1148,7 @@
 OpenSSH $B$O(B Tatu Ylonen $B$K$h$k!"%U%j!<$J(B
 $B%*%j%8%J%kHG(B ssh 1.2.12 $B%j%j!<%9$+$iGI@8$7$?$b$N$G$9!#(B
 Aaron Campbell$B!"(B Bob Beck$B!"(B Markus Friedl$B!"(B Niels Provos$B!"(B
-Theo de Raadt $B$*$h$S(B Dug Song $B$,B?$/$N%P%0$r$H$j=|$-!"(B
+Theo de Raadt $B$*$h$S(B Dug Song $B$,B?$/$N%P%0$r<h$j=|$-!"(B
 $B?7$7$$5!G=$r$U$?$?$SDI2C$7$F(B OpenSSH $B$r$D$/$j$^$7$?!#(B
 SSH $B%W%m%H%3%k(B $B%P!<%8%g%s(B 1.5 $B$*$h$S(B 2.0 $B$N%5%]!<%H$O(B
 Markus Friedl $B$N9W8%$K$h$k$b$N$G$9!#(B
--- sshd.8.orig	Tue Oct  3 18:00:33 2006
+++ sshd.8	Mon Nov 27 22:56:48 2006
@@ -39,10 +39,13 @@
 .\" Japanese translation: $Id: sshd.8,v 1.18 2006/04/17 04:27:53 yusuke Exp $
 .\" by Yusuke Shinyama <yusuke at cs . nyu . edu>
 .\"
+.\" %FreeBSD: src/crypto/openssh/sshd.8,v 1.31.2.2 2006/10/06 14:07:17 des Exp %
+.\" $FreeBSD$
+.\"
 .Dd September 25, 1999
 .Dt SSHD 8
 .Os
-.Sh $BL>A0(B
+.Sh $BL>>N(B
 .Nm sshd
 .Nd OpenSSH SSH $B%G!<%b%s(B
 .Sh $B=q<0(B
@@ -58,7 +61,7 @@
 .Op Fl p Ar $B%]!<%H(B
 .Op Fl u Ar $BD9$5(B
 .Ek
-.Sh $B@bL@(B
+.Sh $B2r@b(B
 .Nm
 (OpenSSH $B%G!<%b%s(B) $B$O(B
 .Xr ssh 1
@@ -70,9 +73,9 @@
 .Nm
 $B$O%/%i%$%"%s%H$+$i$N@\B3$r(B listen $B$7$^$9!#(B
 $BDL>o!"$3$l$O%V!<%H;~$K(B
-.Pa /etc/rc
+.Pa /etc/rc.d/sshd
 $B$+$i5/F0$5$l!"@\B3$r<u$1$D$1$k$?$S$K?7$7$$%G!<%b%s$,(B fork $B$7$^$9!#(B
-Fork $B$7$?%G!<%b%s$O!"80$N8r49!"0E9f2=!"G'>Z!"%3%^%s%I<B9T!"(B
+fork $B$7$?%G!<%b%s$O!"80$N8r49!"0E9f2=!"G'>Z!"%3%^%s%I<B9T!"(B
 $B$=$7$F%G!<%?8r49$r$*$3$J$$$^$9!#(B
 .Pp
 .Nm
@@ -82,12 +85,13 @@
 $B$K$h$C$F@_Dj$9$k$3$H$,$G$-$^$9!#%3%^%s%I%i%$%s$+$i$N%*%W%7%g%s$O!"(B
 $B@_Dj%U%!%$%k$G;XDj$5$l$F$$$kCM$h$j$bM%@h$5$l$^$9!#(B
 .Nm
-$B$O%O%s%0%"%C%W%7%0%J%k(B 
+$B$O%O%s%0%"%C%W%7%0%J%k(B
 .Dv SIGHUP
 $B$r<u$1<h$k$H!"<+J,$N@_Dj%U%!%$%k$rFI$_9~$_$J$*$7$^$9!#(B
-$B$3$l$O<+J,<+?H$r3+;O$7$?$H$-$N%Q%9L>$H%*%W%7%g%s$r(B exec $B$9$k$3$H$K$h$C$F$*$3$J$$$^$9!#(B
+$B$3$l$O<+J,<+?H$r3+;O$7$?$H$-$N%Q%9L>!"(B
 $B$?$H$($P(B
-.Pa /usr/sbin/sshd 
+.Pa /usr/sbin/sshd
+$B$H%*%W%7%g%s$r(B exec $B$9$k$3$H$K$h$C$F$*$3$J$$$^$9!#(B
 .Pp
 $B%3%^%s%I%i%$%s%*%W%7%g%s$K$O<!$N$h$&$J$b$N$,$"$j$^$9(B:
 .Bl -tag -width Ds
@@ -110,9 +114,9 @@
 .It Fl d
 $B%G%P%C%0%b!<%I$K$7$^$9!#%5!<%P$O%7%9%F%`%m%0$KBP$7!"(B
 $B>iD9$J%G%P%C%0I=<($r=PNO$9$k$h$&$K$J$j!"%P%C%/%0%i%&%s%I$K$O0\9T$7$^$;$s!#(B
-$B$^$?%5!<%P$O(B fork $B$;$:!"(B1$B2s$N@\B3$7$+<u$1$D$1$^$;$s!#(B
+$B$^$?%5!<%P$O(B fork $B$;$:!"(B1 $B2s$N@\B3$7$+<u$1$D$1$^$;$s!#(B
 $B$3$N%*%W%7%g%s$O%5!<%P$N%G%P%C%0$N$?$a$@$1$KMQ0U$5$l$F$$$^$9!#(B
-$BJ#?t$N(B 
+$BJ#?t$N(B
 .Fl d
 $B%*%W%7%g%s$r$D$1$k$H%G%P%C%0%l%Y%k$,>e$,$j$^$9!#(B
 $B:G9b$O(B 3 $B$G$9!#(B
@@ -128,8 +132,8 @@
 $B$O@_Dj%U%!%$%k$,$J$$$H5/F0$7$^$;$s!#(B
 .It Fl g Ar $B%m%0%$%s@)8B;~4V(B
 $B%/%i%$%"%s%H$,<+J,<+?H$rG'>Z$9$k$^$G$N@)8B;~4V$r;XDj$7$^$9(B
-($B%G%U%)%k%H$O(B 120$BIC(B)$B!#%/%i%$%"%s%H$,$3$N;~4VFb$K%f!<%6$r(B
-$BG'>Z$G$-$J$+$C$?>l9g!"%5!<%P$O@\B3$r@Z$C$F=*N;$7$^$9!#%<%m$r(B
+($B%G%U%)%k%H$O(B 120 $BIC(B)$B!#%/%i%$%"%s%H$,$3$N;~4VFb$K%f!<%6$r(B
+$BG'>Z$G$-$J$+$C$?>l9g!"%5!<%P$O@\B3$r@Z$C$F=*N;$7$^$9!#(B 0 $B$r(B
 $BCM$H$7$FM?$($k$H@)8B$O$J$/$J$j$^$9!#(B
 .It Fl h Ar $B%[%9%H80%U%!%$%k(B
 $B%[%9%H80$rFI$`%U%!%$%k$r;XDj$7$^$9!#(B
@@ -140,8 +144,6 @@
 $B%G%U%)%k%H$G$O!"%W%m%H%3%k(B $B%P!<%8%g%s(B 1 $BMQ$N80$,(B
 .Pa /etc/ssh/ssh_host_key
 $B$G$"$j!"%W%m%H%3%k(B $B%P!<%8%g%s(B 2 $BMQ$N80$,(B
-.Pa /etc/ssh/ssh_host_rsa_key
-$B$*$h$S(B
 .Pa /etc/ssh/ssh_host_dsa_key
 $B$G$9!#(B
 $B0[$J$k%P!<%8%g%s$N%W%m%H%3%k$d%[%9%H80$NJ}<0$KBP$7!"(B
@@ -162,12 +164,12 @@
 $B$r;H$&$3$H$b2DG=$G$7$g$&!#(B
 .It Fl k Ar $B80$N@8@.4V3V(B
 $B%5!<%P80$,$I$l$/$i$$$N4V3V$G:F@8@.$5$l$k$+$r;XDj$7$^$9(B
-($B%G%U%)%k%H$G$O(B 3600$BIC!"$D$^$j(B 1$B;~4V$4$H$K$J$C$F$$$^$9(B)$B!#(B
+($B%G%U%)%k%H$G$O(B 3600 $BIC!"$D$^$j(B 1 $B;~4V$4$H$K$J$C$F$$$^$9(B)$B!#(B
 $B$3$s$J$KIQHK$K80$r:F@8@.$9$k$N$O0J2<$N$h$&$JM}M3$K$h$j$^$9!#(B
 $B$3$N80$O$I$3$K$b3JG<$5$l$^$;$s!#$=$N$?$a!"$3$N$h$&$K$7$F$*$/$H(B
 $B$?$H$(%^%7%s$,%/%i%C%/$5$l$?$jJ*M}E*$K>h$C<h$i$l$?$j$7$F$b!"(B
-1$B;~4V8e$K$O(B $BEpD0$7$?DL?.$r2rFI$7$F80$r8+$D$1$k$3$H$OIT2DG=$K(B
-$B$J$j$^$9!#$3$NCM$H$7$F%<%m$r;XDj$9$k$H!"(B
+1 $B;~4V8e$K$OEpD0$7$?DL?.$r2rFI$7$F80$r8+$D$1$k$3$H$OIT2DG=$K(B
+$B$J$j$^$9!#$3$NCM$H$7$F(B 0 $B$r;XDj$9$k$H!"(B
 $B80$O$^$C$?$/:F@8@.$5$l$J$/$J$j$^$9!#(B
 .It Fl o Ar $B%*%W%7%g%s(B
 $B@_Dj%U%!%$%k$HF1$87A<0$G%*%W%7%g%s$rM?$($?$$$H$-$K;HMQ$7$^$9!#(B
@@ -202,13 +204,13 @@
 .Li utmp
 $B9=B$BN$N%U%#!<%k%ID9$r;XDj$9$k$N$K;H$o$l$^$9!#L>A02r7h$5$l$?%[%9%H$,$3$N(B
 .Ar len
-$B$h$j$bD9$$>l9g!"%I%C%H$G6h@Z$i$l$?(B 10$B?J$N?tCM$,$+$o$j$KJ];}$5$l$^$9!#(B
+$B$h$j$bD9$$>l9g!"%I%C%H$G6h@Z$i$l$?(B 10 $B?J$N?tCM$,$+$o$j$KJ];}$5$l$^$9!#(B
 $B$3$l$OHs>o$KD9$$%[%9%HL>$r$b$D%[%9%H$,$3$N%U%#!<%k%I$r$"$U$l$5$;$F$b!"(B
 $B0l0U$K<1JL$G$-$k$h$&$K$9$k$?$a$G$9!#(B
 .Fl u0
-$B$r;XDj$9$k$H(B 
+$B$r;XDj$9$k$H(B
 .Pa utmp
-$B%U%!%$%k$K$O$D$M$K%I%C%H$G6h@Z$i$l$?(B 10$B?JCM$,;H$o$l$k$h$&$K$J$j$^$9!#(B
+$B%U%!%$%k$K$O$D$M$K%I%C%H$G6h@Z$i$l$?(B 10 $B?JCM$,;H$o$l$k$h$&$K$J$j$^$9!#(B
 $B$^$?(B
 .Fl u0
 $B$O(B
@@ -232,7 +234,7 @@
 OpenSSH SSH $B%G!<%b%s$O!"%G%U%)%k%H$G(B
 SSH $B%W%m%H%3%k%P!<%8%g%s(B 1 $B$H(B 2 $B$rN>J}%5%]!<%H$7$F$$$^$9!#(B
 $B%5%]!<%H$9$k%W%m%H%3%k$O(B
-.Xr sshd_config 5 
+.Xr sshd_config 5
 $B$N(B
 .Cm Protocol
 $B%*%W%7%g%s$GJQ99$G$-$^$9!#(B
@@ -245,20 +247,20 @@
 $B%W%m%H%3%k%P!<%8%g%s(B 1 $B$G$O!"DI2C$N%5!<%P80$K$h$C$F(B
 forward security
 ($BLuCm(B: $B>-Mh!"80$,GK$i$l$F$b8=:_$NDL?.$NHkF?@-$,J]$?$l$kFC@-(B) $B$r(B
-$BDs6!$7$F$$$^$9!#%5!<%P80$O;H$o$l$k$HDL>o(B 1$B;~4V$*$-$K(B
+$BDs6!$7$F$$$^$9!#%5!<%P80$O;H$o$l$k$HDL>o(B 1 $B;~4V$*$-$K(B
 $B:F@8@.$5$l!"$3$l$O7h$7$F%G%#%9%/$KJ]B8$5$l$^$;$s!#(B
 $B%/%i%$%"%s%H$,@\B3$7$F$/$k$H!"%G!<%b%s$O$=$N%[%9%H(B
-$B8x3+80$H%5!<%P80$r$D$+$C$F1~Ez$7$^$9!#(B
+$B8x3+80$H%5!<%P80$r;H$C$F1~Ez$7$^$9!#(B
 $B%/%i%$%"%s%H$O$=$N(B RSA $B%[%9%H80$r(B
 $B<+J,$N%G!<%?%Y!<%9Cf$K$"$k$b$N$HHf3S$7!"(B
 $B$=$l$,JQ99$5$l$F$$$J$$$3$H$r3N$+$a$^$9!#(B
-$B$=$N8e%/%i%$%"%s%H$O(B 256$B%S%C%H$NMp?t$r@8@.$7!"(B
-$B%[%9%H80$H%5!<%P80$r$D$+$C$F0E9f2=$7$?$"$H(B
+$B$=$N8e%/%i%$%"%s%H$O(B 256 $B%S%C%H$NMp?t$r@8@.$7!"(B
+$B%[%9%H80$H%5!<%P80$r;H$C$F0E9f2=$7$?$"$H(B
 $B0E9f2=$5$l$??tCM$r%5!<%P$KAw$j$^$9!#(B
 $B0J9_!"%/%i%$%"%s%H$H%5!<%P$NN><T$O$3$NMp?t$r(B
 $B%;%C%7%g%s80$H$7$F;H$$!"DL?.$r0E9f2=$7$^$9!#(B
 $B$3$l0J9_$NDL?.$O0lHLE*$J(B Blowfish $B$"$k$$$O(B 3DES ($B%G%U%)%k%H(B)
-$B0E9fJ}<0$r$D$+$C$F0E9f2=$5$l$^$9!#(B
+$B0E9fJ}<0$r;H$C$F0E9f2=$5$l$^$9!#(B
 $B0E9fJ}<0$O!"%/%i%$%"%s%H$,(B
 $B%5!<%P$+$iDs6!$5$l$?$b$N$NCf$+$iA*Br$7$^$9!#(B
 .Pp
@@ -267,7 +269,7 @@
 $B$3$N808r49%W%m%;%9$K$h$j!"%5!<%P$H%/%i%$%"%s%H4V$G(B
 $B6&DL$N%;%C%7%g%s80$,F@$i$l$^$9!#$3$l0J9_$NDL?.$O(B
 $B8=:_$N$H$3$m(B
-128-bit AES, Blowfish, 3DES, CAST128, Arcfour, 192-bit AES 
+128-bit AES, Blowfish, 3DES, CAST128, Arcfour, 192-bit AES
 $B$"$k$$$O(B 256-bit AES $B$J$I$N6&DL800E9fJ}<0$K$h$C$F(B
 $B0E9f2=$5$l$^$9!#(B
 $B0E9fJ}<0$O!"%/%i%$%"%s%H$,(B
@@ -284,10 +286,39 @@
 $B$^$?$O%Q%9%o!<%IG'>Z(B (password authentication) $B$r(B
 $B;HMQ$7$^$9!#(B
 .Pp
+$BG'>Z$N7A<0$K4X$o$i$:!"%"%+%&%s%H$,%"%/%;%92DG=$+$I$&$+$r%A%'%C%/$7$^$9!#(B
+$B%"%+%&%s%H$,%m%C%/$5$l$F$$$k$+!"(B
+.Cm DenyUsers
+$B$K5-:\$5$l$F$$$k$+!"$^$?$O$=$N%0%k!<%W$,(B
+.Cm DenyGroups
+$B$K5-:\$5$l$F$$$k>l9g!"%"%+%&%s%H$O%"%/%;%9$G$-$^$;$s!#(B
+$B%m%C%/$5$l$?%"%+%&%s%H$NDj5A$O%7%9%F%`$K0MB8$7$^$9!#(B
+$B$$$/$D$+$N%W%i%C%H%U%)!<%`(B ($BNc$($P(B AIX) $B$G$OFH<+$N%"%+%&%s%H%G!<%?%Y!<%9$r;}$A!"(B
+$B$^$?$$$/$D$+$O(B passwd $B%U%#!<%k%I$rJQ99$7$^$9(B
+(Solaris $B$*$h$S(B UnixWare $B$G$O(B
+.Ql \&*LK\&* ,
+HP-UX $B$G$O(B
+.Ql \&* ,
+Tru64 $B$G$O(B
+.Ql Nologin
+$B$r4^$_$^$9!#(B
+$B$^$?(B FreeBSD $B$G$O(B
+.Ql \&*LOCKED\&* ,
+Linux $B$G$O(B
+.Ql \&!!
+$B$,@h9T$7$^$9(B)$B!#(B
+$B$"$k%"%+%&%s%H$K8x3+80G'>Z$r5v2D$7$F$*$-$J$,$i!"%Q%9%o!<%IG'>Z$r(B
+$BL58z$K$9$kI,MW$,$"$k>l9g!"%Q%9%o!<%I%U%#!<%k%I$O$3$l$i0J30$NCM(B
+($BNc$($P(B
+.Ql NP
+$B$^$?$O(B
+.Ql \&*NP\&* )
+$B$K@_Dj$9$kI,MW$,$"$j$^$9!#(B
+.Pp
 $B%/%i%$%"%s%H$,G'>Z$K@.8y$9$k$H!"%;%C%7%g%s$r=`Hw$9$k$?$a$N(B
 $BBPOC$,$*$3$J$o$l$^$9!#$3$N;~E@$G!"%/%i%$%"%s%H$O(B
-$B2>A[C<Kv$N;HMQ$rMW5a$7$?$j!"(BX11$B@\B3$NE>Aw!"(B
-TCP$B@\B3$NE>Aw!"$"$k$$$OG'>Z%(!<%8%'%s%H$NE>Aw$J$I$r(B
+$B2>A[C<Kv$N;HMQ$rMW5a$7$?$j!"(BX11 $B@\B3$NE>Aw!"(B
+TCP $B@\B3$NE>Aw!"$"$k$$$OG'>Z%(!<%8%'%s%H$NE>Aw$J$I$r(B
 $B0BA4$JDL?.O)$r2p$7$FMW5a$9$k$3$H$,$G$-$^$9!#(B
 .Pp
 $B$3$N8e!"%/%i%$%"%s%H$O%7%'%k$rMW5a$9$k$+!"(B
@@ -319,6 +350,8 @@
 $B%f!<%6$,C<Kv$K%m%0%$%s$7$F$$$k>l9g!"%m%0%$%s;~9o$r5-O?$9$k!#(B
 .It
 .Pa /etc/nologin
+$B$H(B
+.Pa /var/run/nologin
 $B$r%A%'%C%/$9$k!#$3$l$,B8:_$9$k>l9g!"(B (root $B$G$J$1$l$P(B)
 $B$=$NFbMF$rI=<($7$F=*N;$9$k!#(B
 .It
@@ -330,7 +363,7 @@
 $B$,B8:_$7$F$$$F!"(B
 $B%f!<%6$N4D6-JQ?t$rJQ99$9$k$3$H$,5v$5$l$F$$$l$P!"(B
 $B$=$l$rFI$_9~$`!#(B
-.Xr sshd_config 5 
+.Xr sshd_config 5
 $B$N(B
 .Cm PermitUserEnvironment
 $B@_Dj9`L\$r;2>H$N$3$H!#(B
@@ -341,7 +374,9 @@
 $B$,B8:_$9$k>l9g!"$=$l$r<B9T$9$k!#$=$&$G$J$1$l$P!"$b$7(B
 .Pa /etc/ssh/sshrc
 $B$,B8:_$7$F$$$k$J$i!"$=$l$r<B9T$9$k!#(B
-$B$3$l0J30$N>l9g$O(B xauth $B$r<B9T$9$k!#$3$N(B
+$B$3$l0J30$N>l9g$O(B
+.Xr xauth 1
+$B$r<B9T$9$k!#$3$N(B
 .Dq rc
 $B%U%!%$%k$K$O!"(BX11 $B$NG'>Z%W%m%H%3%k$H$=$N%/%C%-!<$,(B
 $BI8=`F~NO$+$iM?$($i$l$k!#(B($B2<5-$N(B
@@ -410,7 +445,7 @@
 $B%W%m%H%3%k(B $B%P!<%8%g%s(B 2 $B$N8x3+80$G$O!"(B
 $B0J2<$N9`L\$,3JG<$5$l$F$$$^$9(B:
 $B%*%W%7%g%s!"80$N<oN`!"(B
-base64$B%(%s%3!<%I$5$l$?80K\BN!"80$N%3%a%s%H!#(B
+base64 $B%(%s%3!<%I$5$l$?80K\BN!"80$N%3%a%s%H!#(B
 $B%*%W%7%g%s9`L\$O$J$/$F$b$+$^$$$^$;$s!#(B
 $B%*%W%7%g%s$,B8:_$9$k$+$I$&$+$O!"(B
 $B$3$N9T$,?t;z$G;O$^$k$+$I$&$+$K$h$C$F7hDj$5$l$^$9(B
@@ -424,11 +459,11 @@
 .Dq ssh-rsa
 $B$G$9!#(B
 .Pp
-$B$3$l$i$N%U%!%$%k$G$ODL>o!"(B 1$B9T$,2?I4%P%$%H$b$ND9$5$K(B
-$B$J$C$F$$$k$3$H$KCm0U$7$F$/$@$5$$(B 
+$B$3$l$i$N%U%!%$%k$G$ODL>o!"(B 1 $B9T$,2?I4%P%$%H$b$ND9$5$K(B
+$B$J$C$F$$$k$3$H$KCm0U$7$F$/$@$5$$(B
 ($B$3$l$O8x3+80$N78?t$N%5%$%:$,Bg$-$$$?$a$G$9(B)$B!#(B
-DSA $B80$ND9$5$N@)8B$O:GBg(B 8$B%-%m%P%$%H$G!"(B
-RSA $B80$N:GBg$O(B 16$B%-%m%P%$%H$G$9!#(B
+DSA $B80$ND9$5$N@)8B$O:GBg(B 8 $B%-%m%P%$%H$G!"(B
+RSA $B80$N:GBg$O(B 16 $B%-%m%P%$%H$G$9!#(B
 $B$3$l$r<j$G%?%$%W$9$k5$$K$O$J$i$J$$$G$7$g$&!#$+$o$j$K(B
 .Pa identity.pub ,
 .Pa id_dsa.pub
@@ -438,13 +473,13 @@
 .Pp
 .Nm
 $B$G$O!"%W%m%H%3%k(B 1 $B$H%W%m%H%3%k(B 2 $B$NN>J}$G!"(B
-RSA $B80$ND9$5$,>/$J$/$H$b(B 768$B%S%C%H0J>e$G$"$kI,MW$,$"$j$^$9!#(B
+RSA $B80$ND9$5$,>/$J$/$H$b(B 768 $B%S%C%H0J>e$G$"$kI,MW$,$"$j$^$9!#(B
 .Pp
-$B%*%W%7%g%s$O(B ($B$b$7$"$l$P(B) $B%+%s%^$K$h$C$F(B
+$B%*%W%7%g%s$O(B ($B$b$7$"$l$P(B) $B%3%s%^$K$h$C$F(B
 $B6h@Z$k$3$H$,$G$-$^$9!#(B
 $B4V$K%9%Z!<%9$rF~$l$F$O$$$1$^$;$s$,!"(B
 $B%@%V%k%/%)!<%H$N4V$K$O$5$a$P%*%C%1!<$G$9!#(B
-$B0J2<$N%*%W%7%g%s$,%5%]!<%H$5$l$F$$$^$9(B 
+$B0J2<$N%*%W%7%g%s$,%5%]!<%H$5$l$F$$$^$9(B
 ($B$3$l$i$N%-!<%o!<%I$OBgJ8;z>.J8;z$r6hJL$7$^$;$s(B) :
 .Bl -tag -width Ds
 .It Cm command="command"
@@ -455,7 +490,7 @@
 $B$3$3$G;XDj$5$l$?%3%^%s%I$O2>A[C<Kv>e$G<B9T$5$l$^$9!#(B
 $B$=$&$G$J$1$l$PC<Kv$J$7$G<B9T$5$l$^$9!#(B
 8-bit $B%/%j!<%s$JDL?.$,M_$7$$>l9g$O!"(B
-$B2>A[C<Kv$rMW5a$7$F$O$$$1$^$;$s!#$"$k$$$O(B 
+$B2>A[C<Kv$rMW5a$7$F$O$$$1$^$;$s!#$"$k$$$O(B
 .Cm no-pty
 $B%*%W%7%g%s$r;H$C$F$/$@$5$$!#(B
 $B%3%^%s%IJ8;zNsCf$K%@%V%k%/%)!<%H$rF~$l$?$$$H$-$O!"(B
@@ -487,12 +522,12 @@
 .It Cm from="pattern-list"
 $B$3$N%*%W%7%g%s$r$D$1$k$H!"8x3+80G'>Z$K2C$($F!"(B
 $B%/%i%$%"%s%H$N%[%9%H$r%A%'%C%/$G$-$k$h$&$K$J$j$^$9!#(B
-$B%+%s%^$G6h@Z$C$?%j%b!<%H%[%9%HL>(B (canonical name) $B$N(B
+$B%3%s%^$G6h@Z$C$?%j%b!<%H%[%9%HL>(B (canonical name) $B$N(B
 $B%Q%?!<%sNs$,;XDj$G$-$^$9!#(B
 $B$3$N%*%W%7%g%s$O%;%-%e%j%F%#$r>e$2$k$?$a$K$D$1$i$l$^$7$?(B:
 $B8x3+80G'>Z$=$l<+BN$O!"(B($B80$r=|$$$F(B) $B%M%C%H%o!<%/$d(B
 $B%M!<%`%5!<%P!"$=$NB>$"$j$H$"$i$f$k$b$N$r?.MQ$7$^$;$s!#(B
-$B$7$+$7!"$b$72?J*$+$,2?$i$+$NJ}K!$G80$rEp$`$3$H$,$G$-$l$P!"(B
+$B$7$+$7!"$b$72?<T$+$,2?$i$+$NJ}K!$G80$rEp$`$3$H$,$G$-$l$P!"(B
 $B$=$N80$r;H$C$F@$3&$N$I$3$+$i$G$b%m%0%$%s$G$-$F$7$^$&$3$H$K$J$j$^$9!#(B
 $B$3$N%*%W%7%g%s$O!"$=$N$h$&$JEp$^$l$?80$r;H$&$3$H$r(B
 $B$h$j:$Fq$K$7$^$9(B ($B$b$7$3$l$r;H$*$&$H$9$k$J$i!"80$N$[$+$K(B
@@ -526,7 +561,7 @@
 IPv6 $B%"%I%l%9$N>l9g$O!";XDj$9$k7A<0$,0[$J$j$^$9(B:
 .Ar host Ns / Ns Ar port
 .Cm permitopen
-$B%*%W%7%g%s$O%+%s%^$G6h@Z$C$FJ#?t8D;XDj$9$k$3$H$b$G$-$^$9!#(B
+$B%*%W%7%g%s$O%3%s%^$G6h@Z$C$FJ#?t8D;XDj$9$k$3$H$b$G$-$^$9!#(B
 $B%Q%?!<%s%^%C%A%s%0$O$*$3$J$o$l$^$;$s!#(B
 $B%[%9%HL>$K$O%I%a%$%sL>$+%"%I%l%9$r(B
 $B$=$N$^$^=q$/I,MW$,$"$j$^$9!#(B
@@ -566,11 +601,11 @@
 $BDI2C$5$l$k$h$&$K$J$C$F$$$^$9!#(B
 .Pp
 $B$3$l$i$N(B known_hosts $B%U%!%$%k$N3F9T$O(B
-$B<!$N$h$&$J9`L\$+$i$J$C$F$$$^$9(B: 
+$B<!$N$h$&$J9`L\$+$i$J$C$F$$$^$9(B:
 $B%[%9%HL>!"%S%C%H?t!";X?t!"78?t(B (modulus)$B!"$=$7$F%3%a%s%H!#(B
 $B3F9`L\$O%9%Z!<%9$K$h$C$F6h@Z$i$l$F$$$^$9!#(B
 .Pp
-$B%[%9%HL>$O%+%s%^$G6h@Z$i$l$?%Q%?!<%sNs$G$9(B
+$B%[%9%HL>$O%3%s%^$G6h@Z$i$l$?%Q%?!<%sNs$G$9(B
 .Pf ( Ql *
 $B$*$h$S(B
 .Ql \&?
@@ -615,7 +650,7 @@
 .Ql #
 $B$G;O$^$k9T$*$h$S6u9T$O%3%a%s%H$H$7$FL5;k$5$l$^$9!#(B
 .Pp
-$B%[%9%H4VG'>Z$r$*$3$J$&$5$$!"(B
+$B%[%9%H4VG'>Z$r$*$3$J$&:]!"(B
 $B$I$l$+E,@Z$J80$r$b$C$?9T$,%^%C%A$9$l$P!"(B
 $BG'>Z$O<u$1F~$l$i$l$^$9!#(B
 $B$7$?$,$C$FF1$8L>A0$,J#?t$N9T$K$"$C$?$j!"(B
@@ -654,7 +689,7 @@
 $B$*$h$S(B
 .Cm PrintMotd
 $B$,$=$l$>$l5v2D$5$l$F$$$k>l9g$G$b(B
-$B:G=*%m%0%$%s;~9o$H(B 
+$B:G=*%m%0%$%s;~9o$H(B
 .Pa /etc/motd
 $B%U%!%$%k$NI=<($O$5$l$J$/$J$j$^$9!#(B
 $B$7$+$7(B
@@ -697,7 +732,7 @@
 $B$O(B
 .Cm StrictModes
 $B$,(B
-.Dq no 
+.Dq no
 $B$K@_Dj$5$l$F$$$J$$8B$j!"$3$N%U%!%$%k$NFbMF$r;HMQ$7$^$;$s!#(B
 $B$3$N%U%!%$%k$r?d>)$5$l$k%Q!<%_%C%7%g%s$K$9$k$K$O!"(B
 $B0J2<$N$h$&$K<B9T$7$^$9(B:
@@ -751,11 +786,11 @@
 Diffie-Hellman $B808r49(B (Diffie-Hellman Group Exchange) $B$G(B
 $B;H$o$l$k!"(BDiffie-Hellman $B72$r3JG<$7$^$9!#(B
 $B$3$N%U%!%$%k$N7A<0$O(B
-.Xr moduli 5 
+.Xr moduli 5
 $B$G@bL@$5$l$F$$$^$9!#(B
 .Pp
 .It /etc/motd
-.Xr motd 5 
+.Xr motd 5
 $B$r;2>H$7$F$/$@$5$$!#(B
 .Pp
 .It /etc/nologin
@@ -785,7 +820,7 @@
 .It /etc/ssh/ssh_host_key
 .It /etc/ssh/ssh_host_dsa_key
 .It /etc/ssh/ssh_host_rsa_key
-$B$3$l$i(B 3$B$D$N%U%!%$%k$O%[%9%H$NHkL)80$r3JG<$7$^$9!#(B
+$B$3$l$i(B 3 $B$D$N%U%!%$%k$O%[%9%H$NHkL)80$r3JG<$7$^$9!#(B
 $B$3$N%U%!%$%k$O(B root $B$,=jM-$7!"(B
 root $B$@$1$,FI$_9~$_2DG=$K$9$Y$-$G$"$j!"(B
 $B$3$l0J30$NC/$K$bFI$^$;$F$O$$$1$^$;$s!#(B
@@ -796,7 +831,7 @@
 .It /etc/ssh/ssh_host_key.pub
 .It /etc/ssh/ssh_host_dsa_key.pub
 .It /ssh/etc/ssh_host_rsa_key.pub
-$B$3$l$i(B 3$B$D$N%U%!%$%k$O%[%9%H80$N8x3+80ItJ,$r3JG<$7$^$9!#(B
+$B$3$l$i(B 3 $B$D$N%U%!%$%k$O%[%9%H80$N8x3+80ItJ,$r3JG<$7$^$9!#(B
 $B$3$N%U%!%$%k$OC/$K$G$bFI$a$k$h$&$K$J$C$F$$$k(B
 $BI,MW$,$"$j$^$9$,!"(B
 $B=q$-9~$a$k$N$O(B root $B$@$1$K$7$F$/$@$5$$!#(B
@@ -804,7 +839,7 @@
 $B$3$N%U%!%$%k$,<B:]$K;H$o$l$k$3$H$O$"$j$^$;$s!#(B
 $B$3$l$OC1$K%f!<%6$NJX59$r$O$+$k$?$a$@$1$KB8:_$7!"(B
 $B%f!<%6$O$3$l$r(B known_hosts $B%U%!%$%k$K%3%T!<$9$k(B
-$B$3$H$,$G$-$^$9!#$3$l$i(B 2$B$D$N%U%!%$%k(B ($BHkL)80$H8x3+80(B) $B$O(B
+$B$3$H$,$G$-$^$9!#$3$l$i(B 2 $B$D$N%U%!%$%k(B ($BHkL)80$H8x3+80(B) $B$O(B
 .Xr ssh-keygen 1
 $B$r;H$C$F@8@.$9$k$3$H$,$G$-$^$9!#(B
 .Pp
@@ -824,7 +859,7 @@
 .Pp
 .It Pa /var/empty
 .Nm
-$B$,FC8"J,N%$N$5$$$K!"G'>ZA0$NCJ3,$G;HMQ$9$k(B
+$B$,FC8"J,N%$N:]$K!"G'>ZA0$NCJ3,$G;HMQ$9$k(B
 .Xr chroot 2
 $BMQ$N%G%#%l%/%H%j$G$9!#(B
 $B$3$N%G%#%l%/%H%j$O$I$s$J%U%!%$%k$b4^$s$G$$$F$O$J$i$:!"(B
@@ -832,7 +867,7 @@
 $B=q$-$3$a$k$h$&$K$J$C$F$$$F$O$$$1$^$;$s!#(B
 .Pp
 .It Pa /var/run/sshd.pid
-$B8=:_(B $B@\B3$r<u$1$D$1$F$$$k(B
+$B8=:_!"@\B3$r<u$1$D$1$F$$$k(B
 .Nm
 $B$N%W%m%;%9(B ID $B$,F~$C$F$$$^$9(B ($BJ#?t$N(B
 .Nm
@@ -859,7 +894,7 @@
 OpenSSH $B$O(B Tatu Ylonen $B$K$h$k!"%U%j!<$J(B
 $B%*%j%8%J%kHG(B ssh 1.2.12 $B%j%j!<%9$+$iGI@8$7$?$b$N$G$9!#(B
 Aaron Campbell$B!"(B Bob Beck$B!"(B Markus Friedl$B!"(B Niels Provos$B!"(B
-Theo de Raadt $B$*$h$S(B Dug Song $B$,B?$/$N%P%0$r$H$j=|$-!"(B
+Theo de Raadt $B$*$h$S(B Dug Song $B$,B?$/$N%P%0$r<h$j=|$-!"(B
 $B?7$7$$5!G=$r$U$?$?$SDI2C$7$F(B OpenSSH $B$r$D$/$j$^$7$?!#(B
 SSH $B%W%m%H%3%k(B $B%P!<%8%g%s(B 1.5 $B$*$h$S(B 2.0 $B$N%5%]!<%H$O(B
 Markus Friedl $B$N9W8%$K$h$k$b$N$G$9!#(B
--- sshd_config.5.orig	Wed Oct  4 21:39:47 2006
+++ sshd_config.5	Mon Nov 27 22:56:48 2006
@@ -39,17 +39,20 @@
 .\" Japanese translation: $Id: sshd_config.5,v 1.14 2006/04/17 04:27:53 yusuke Exp $
 .\" by Yusuke Shinyama <yusuke @ cs . nyu . edu>
 .\"
+.\" %FreeBSD: src/crypto/openssh/sshd_config.5,v 1.23.2.4 2006/11/11 00:51:28 des Exp %
+.\" $FreeBSD$
+.\"
 .Dd September 25, 1999
 .Dt SSHD_CONFIG 5
 .Os
-.Sh $BL>A0(B
+.Sh $BL>>N(B
 .Nm sshd_config
 .Nd OpenSSH SSH $B%G!<%b%s(B $B@_Dj%U%!%$%k(B
 .Sh $B=q<0(B
 .Bl -tag -width Ds -compact
 .It Pa /etc/ssh/sshd_config
 .El
-.Sh $B@bL@(B
+.Sh $B2r@b(B
 .Xr sshd 8
 $B$O(B
 .Pa /etc/ssh/sshd_config
@@ -82,7 +85,7 @@
 $B4D6-JQ?t$OL>A0$G;XDj$7$^$9!#L>A0$K$O%o%$%k%I%+!<%IJ8;z(B
 .Ql *
 $B$^$?$O(B
-.Ql \&? 
+.Ql \&?
 $B$r4^$`$3$H$,$G$-$^$9!#(B
 $BJ#?t$N4D6-JQ?t$r;XDj$9$k>l9g$O6uGrJ8;z$G6h@Z$k$+!"(B
 $B$"$k$$$OJ#?t$N(B
@@ -96,7 +99,6 @@
 .Xr sshd 8
 $B$,!"$I$N%"%I%l%9%U%!%_%j$r;H$&$Y$-$+$r;XDj$7$^$9!#(B
 $B$H$j$&$kCM$O(B
-Valid arguments are
 .Dq any
 ($B$9$Y$F(B)$B!"(B
 .Dq inet
@@ -156,7 +158,7 @@
 .Sx $B%Q%?!<%s(B
 $B$N9`$r;2>H$7$F$/$@$5$$!#(B
 .It Cm AuthorizedKeysFile (authorized_keys $B%U%!%$%k(B)
-$B%f!<%6G'>Z$N$5$$$K;H$o$l$k8x3+80$r3JG<$7$F$$$k%U%!%$%kL>$r(B
+$B%f!<%6G'>Z$N:]$K;H$o$l$k8x3+80$r3JG<$7$F$$$k%U%!%$%kL>$r(B
 $B;XDj$7$^$9!#(B
 .Cm AuthorizedKeysFile
 $B$N%U%!%$%kL>Cf$K(B %T $B$,4^$^$l$F$$$k>l9g!"$=$NItJ,$O@\B3$N4V(B
@@ -177,15 +179,23 @@
 $B%G%U%)%k%H$G$O!"%P%J!<$OI=<($5$l$^$;$s!#(B
 .It Cm ChallengeResponseAuthentication ($B%A%c%l%s%8!&%l%9%]%s%9G'>Z(B)
 $B%A%c%l%s%8!&%l%9%]%s%9G'>Z$r5v2D$9$k$+$I$&$+;XDj$7$^$9!#(B
-.Xr login.conf 5
-$B$K5-$5$l$F$$$k$9$Y$F$NG'>Z7A<0$,;H$($^$9!#(B
+$BFC$K(B
+.Fx
+$B$G$O!"(BPAM
+.Xr ( pam 3
+$B;2>H(B) $B$rG'>Z$K;HMQ$9$k$+$r@)8f$7$^$9!#(B
+$B$3$l$O!"(B
+.Cm PasswordAuthentication
+$B$*$h$S(B
+.Cm PermitRootLogin
+$BJQ?t$N8z2L$K1F6A$7$^$9!#(B
 $B%G%U%)%k%H$O(B
 .Dq yes
 $B$G$9!#(B
 .It Cm Ciphers (SSH2$B$N0E9fJ}<0(B)
 $B%W%m%H%3%k(B $B%P!<%8%g%s(B 2 $B$G5v2D$5$l$k0E9fJ}<0$r(B
 $B;XDj$7$^$9!#J#?t$N0E9fJ}<0$r;XDj$9$k>l9g$O!"(B
-$B%+%s%^$G6h@Z$C$F$/$@$5$$!#(B
+$B%3%s%^$G6h@Z$C$F$/$@$5$$!#(B
 $B8=:_%5%]!<%H$5$l$F$$$k0E9fJ}<0$O0J2<$N$H$*$j$G$9(B:
 .Dq 3des-cbc ,
 .Dq aes128-cbc ,
@@ -229,7 +239,7 @@
 ($B2<5-(B) $B$,(B 15 $B$K@_Dj$5$l!"(B
 .Cm ClientAliveCountMax
 $B$,%G%U%)%k%H$N$^$^$G$"$k>l9g!"$3$l$KH?1~$G$-$J$$(B SSH $B%/%i%$%"%s%H$O(B
-$B$*$h$=(B 45$BIC8e$K@\B3$,@Z$i$l$^$9!#(B
+$B$*$h$=(B 45 $BIC8e$K@\B3$,@Z$i$l$^$9!#(B
 $B$3$N@_Dj9`L\$O(B $B%W%m%H%3%k(B $B%P!<%8%g%s(B 2 $B$G$N$_%5%]!<%H$5$l$F$$$^$9!#(B
 .It Cm ClientAliveInterval ($B%/%i%$%"%s%H$N@8B8%A%'%C%/4V3V(B)
 .Xr sshd 8
@@ -242,10 +252,10 @@
 $B$3$N@_Dj9`L\$O(B $B%W%m%H%3%k(B $B%P!<%8%g%s(B 2 $B$G$N$_%5%]!<%H$5$l$F$$$^$9!#(B
 .It Cm Compression ($B05=L(B)
 $B05=L$r5v2D$9$k$+$I$&$+!"$"$k$$$OCY1d05=L(B ($B$=$N%f!<%6$,G'>Z$5$l$F$+$i(B
-$B$O$8$a$F05=L$r5v2D$9$k(B) $B$r$*$3$J$&$+$I$&$+$r;XDj$7$^$9!#(B
+$B=i$a$F05=L$r5v2D$9$k(B) $B$r$*$3$J$&$+$I$&$+$r;XDj$7$^$9!#(B
 $B$3$N0z?t$,$H$j$&$kCM$O(B
 .Dq yes ,
-.Dq delayed 
+.Dq delayed
 $B$^$?$O(B
 .Dq no
 $B$G$9!#%G%U%)%k%H$G$O(B
@@ -293,7 +303,7 @@
 $B$N9`$r;2>H$7$F$/$@$5$$!#(B
 .It Cm ForceCommand ($B6/@)%3%^%s%I<B9T(B)
 $B%/%i%$%"%s%H$,;XDj$7$?%3%^%s%I$rL5;k$7!"(B
-.Cm ForceCommand 
+.Cm ForceCommand
 $B$K$h$C$F;XDj$5$l$?%3%^%s%I$r6/@)E*$K<B9T$7$^$9!#(B
 $B$3$N%3%^%s%I$O$=$N%f!<%6$N%m%0%$%s%7%'%k$N(B -c $B%*%W%7%g%s$r;H$C$F<B9T$5$l$^$9!#(B
 $B$3$N9`L\$O%7%'%k!"%3%^%s%I<B9T!"$"$k$$$O%5%V%7%9%F%`$N<B9T$KE,MQ$5$l$^$9!#(B
@@ -312,17 +322,17 @@
 $BKI$$$G$$$^$9!#(B
 .Cm GatewayPorts
 $B$O(B sshd $B$K%j%b!<%HE>Aw%]!<%H$r(B
-$B%k!<%W%P%C%/%$%s%?!<%U%'%$%90J30$N%"%I%l%9$K(B bind $B$5$;$k$H$-$K;H$$$^$9!#(B
+$B%k!<%W%P%C%/%$%s%?%U%'!<%90J30$N%"%I%l%9$K(B bind $B$5$;$k$H$-$K;H$$$^$9!#(B
 $B$3$l$K$h$C$FB>$N%[%9%H$,E>Aw$5$l$?%]!<%H$K@\B3$G$-$k$h$&$K$J$j$^$9!#(B
 $B0z?t$NCM$H$7$F!"E>Aw$5$l$?%]!<%H$r%m!<%+%k$+$i$N$_MxMQ2DG=$K$7$?$$>l9g$O(B
-.Dq no 
+.Dq no
 $B!"$$$+$J$k%"%I%l%9$+$i$bMxMQ2DG=$K$7$?$$>l9g$O(B
 .Dq yes
 $B!"$"$k$$$O%/%i%$%"%s%HB&$K(B bind $B$9$Y$-%"%I%l%9$r;XDj$5$;$?$$>l9g$O(B
 .Dq clientspecified
 $B$r;XDj$7$^$9!#(B
 $B%G%U%)%k%H$O(B
-.Dq no 
+.Dq no
 $B$K$J$C$F$$$^$9!#(B
 .It Cm GSSAPIAuthentication (GSSAPI $BG'>Z(B)
 GSSAPI $B%Y!<%9$N%f!<%6G'>Z$r;HMQ$9$k$+$I$&$+$r;XDj$7$^$9!#(B
@@ -345,7 +355,7 @@
 .Cm RhostsRSAAuthentication (RhostsRSA $BG'>Z$N5v2D(B)
 $B$K;w$F$*$j!"%W%m%H%3%k(B $B%P!<%8%g%s(B 2 $B$N$_$K:nMQ$7$^$9!#(B
 $B%G%U%)%k%H$NCM$O(B
-.Dq no 
+.Dq no
 $B$K$J$C$F$$$^$9!#(B
 .It Cm HostbasedUsesNameFromPacketOnly ($B%[%9%H%Y!<%9%IG'>Z$K$*$1$k%[%9%HL>$N;HMQJ}K!(B)
 $B%[%9%H%Y!<%9%IG'>Z(B (
@@ -371,8 +381,6 @@
 $B%G%U%)%k%H$G$O!"%W%m%H%3%k(B $B%P!<%8%g%s(B 1 $BMQ$N80$,(B
 .Pa /etc/ssh/ssh_host_key
 $B$G$"$j!"%W%m%H%3%k(B $B%P!<%8%g%s(B 2 $BMQ$N80$,(B
-.Pa /etc/ssh/ssh_host_rsa_key
-$B$*$h$S(B
 .Pa /etc/ssh/ssh_host_dsa_key
 $B$G$9!#(B
 $B$3$N%U%!%$%k$,%0%k!<%W$"$k$$$OB>?M$+$i%"%/%;%92DG=$K$J$C$F$$$k$H!"(B
@@ -388,7 +396,7 @@
 .It Cm IgnoreRhosts (rhosts $B$NL5;k(B)
 .Cm RhostsRSAAuthentication
 $B$^$?$O(B
-.Cm HostbasedAuthentication 
+.Cm HostbasedAuthentication
 $B$N3FG'>Z$G!"(B
 .Pa .rhosts
 $B$*$h$S(B
@@ -398,7 +406,7 @@
 $B$3$N>uBV$G$b!"(B
 .Pa /etc/hosts.equiv
 $B$*$h$S(B
-.Pa /etc/shosts.equiv
+.Pa /etc/ssh/shosts.equiv
 $B$O0MA3$H$7$FM-8z$G$9!#%G%U%)%k%H$G$O(B
 .Dq yes
 $B$K$J$C$F$$$^$9!#(B
@@ -410,7 +418,7 @@
 .Pa ~/.ssh/known_hosts
 $B%U%!%$%k$r;H$o$J$$$h$&$K$7$^$9!#(B
 $B%G%U%)%k%H$O(B
-.Dq no 
+.Dq no
 $B$G$9!#(B
 .It Cm KerberosAuthentication (Kerberos $BG'>Z(B)
 $B%f!<%6$,(B
@@ -421,17 +429,11 @@
 $B%G%U%)%k%H$G$O(B
 .Dq no
 $B$K$J$C$F$$$^$9!#(B
-.It Cm KerberosGetAFSToken (Kerberos $B$G(B AFS $B%H!<%/%s$r<hF@$9$k(B)
-AFS $B$,%"%/%F%#%V$G!"$=$N%f!<%6$,(B Kerberos 5 TGT $B$r;}$C$F$$$k>l9g!"(B
-$B$=$N%f!<%6$N%[!<%`%G%#%l%/%H%j$K%"%/%;%9$9$kA0$K(B AFS $B%H!<%/%s$r<hF@$7$h$&$H$7$^$9!#(B
-$B%G%U%)%k%H$O(B
-.Dq no
-$B$G$9!#(B
 .It Cm KerberosGetAFSToken (Kerberos AFS $B%H!<%/%s$r<hF@$9$k(B)
 AFS $B$,M-8z$G%f!<%6$,(B Kerberos 5 TGT $B$r$b$C$F$$$k>l9g!"(B
 $B$=$N%f!<%6$N%[!<%`%G%#%l%/%H%j$K%"%/%;%9$9$kA0$K(B AFS $B%H!<%/%s$r<hF@$7$h$&$H$3$3$m$_$^$9!#(B
 $B%G%U%)%k%H$G$O(B
-.Dq no 
+.Dq no
 $B$K$J$C$F$$$^$9!#(B
 .It Cm KerberosOrLocalPasswd (Kerberos$B$"$k$$$O%m!<%+%k%Q%9%o!<%I(B)
 Kerberos $B7PM3$N%Q%9%o!<%IG'>Z$,<:GT$9$k$H!"$=$N%Q%9%o!<%I$O(B
@@ -449,7 +451,7 @@
 $B;XDj$5$l$?4V3V$4$H$K<+F0E*$K:F@8@.$5$l$^$9!#$3$N$h$&$K80$r:F@8@.$9$k(B
 $BL\E*$O!"$"$H$G$=$N%^%7%s$K?/F~$7$FEpD0$7$?%;%C%7%g%s$r2rFI$5$l$?$j!"(B
 $B80$rEp$^$l$?$j$9$k$N$rKI$0$?$a$G$9!#$3$N80$O$I$3$K$b3JG<$5$l$^$;$s!#(B
-$BCM$H$7$F%<%m$r;XDj$9$k$H!"80$O$^$C$?$/:F@8@.$5$l$J$/$J$j$^$9!#(B
+$BCM$H$7$F(B 0 $B$r;XDj$9$k$H!"80$O$^$C$?$/:F@8@.$5$l$J$/$J$j$^$9!#(B
 $B%G%U%)%k%H$G$O(B 3600 ($BIC(B) $B$K$J$C$F$$$^$9!#(B
 .It Cm ListenAddress ($B@\B3<uIU%"%I%l%9(B)
 .Xr sshd 8
@@ -489,7 +491,7 @@
 $B$3$N@_Dj9`L\$h$j$bA0$K;XDj$7$F$*$/I,MW$,$"$j$^$9!#(B
 .It Cm LoginGraceTime ($B%m%0%$%sM1M=;~4V(B)
 $B%f!<%6$,$3$3$G;XDj$5$l$?;~4VFb$K%m%0%$%s$G$-$J$$$H!"(B
-$B%5!<%P$O@\B3$r@Z$j$^$9!#$3$NCM$r%<%m$K$9$k$H!";~4V@)8B$O$J$/$J$j$^$9!#(B
+$B%5!<%P$O@\B3$r@Z$j$^$9!#$3$NCM$r(B 0 $B$K$9$k$H!";~4V@)8B$O$J$/$J$j$^$9!#(B
 $B%G%U%)%k%H$NCM$O(B 120 ($BIC(B) $B$G$9!#(B
 .It Cm LogLevel ($B%m%0%l%Y%k(B)
 .Xr sshd 8
@@ -504,7 +506,7 @@
 $B;HMQ$9$k(B MAC ($B%a%C%;!<%8G'>Z%3!<%I(B) $BJ}<0$NM%@h=g0L$r;XDj$7$^$9!#(B
 MAC $BJ}<0$O%W%m%H%3%k(B $B%P!<%8%g%s(B 2 $B$G;H$o$l$k!"(B
 $B%G!<%?$N2~$6$s$rKI$05!9=(B (data integrity protection) $B$G$9!#(B
-$BJ#?t$NJ}<0$r%+%s%^$G6h@Z$C$F;XDj$7$^$9!#%G%U%)%k%H$O(B
+$BJ#?t$NJ}<0$r%3%s%^$G6h@Z$C$F;XDj$7$^$9!#%G%U%)%k%H$O(B
 .Dq hmac-md5,hmac-sha1,hmac-ripemd160,hmac-sha1-96,hmac-md5-96
 $B$N=g$K$J$C$F$$$^$9!#(B
 .It Cm Match ($B>r7oJ,4t(B)
@@ -534,9 +536,9 @@
 .Cm GatewayPorts ,
 .Cm PermitOpen ,
 .Cm X11DisplayOffset ,
-.Cm X11Forwarding 
+.Cm X11Forwarding
 $B$*$h$S(B
-.Cm X11UseLocalHost 
+.Cm X11UseLocalHost
 $B$G$9!#(B
 .It Cm MaxAuthTries ($B:GBgG'>Z;n9T2s?t(B)
 1$B@\B3$"$?$j$NG'>Z$r:GBg$G2?2s$^$G;n$_$k$3$H$,$G$-$k$+$r;XDj$7$^$9!#(B
@@ -552,7 +554,7 @@
 $B%G%U%)%k%H$G$O$3$N?t$O(B 10 $B$G$9!#(B
 .Pp
 $B$b$&$R$H$D$NJ}K!$O!"Aa$$$&$A$+$i%i%s%@%`$K@\B3$r5qH]$9$k$h$&(B
-$B;XDj$9$k$3$H$G$9!#$3$l$O$3$N@_Dj9`L\$K%3%m%s$G6h@Z$C$?(B 3$B$D$NCM$r(B
+$B;XDj$9$k$3$H$G$9!#$3$l$O$3$N@_Dj9`L\$K%3%m%s$G6h@Z$C$?(B 3 $B$D$NCM$r(B
 $BM?$($k$3$H$K$h$j$*$3$J$$$^$9!#$3$NCM$O(B
 .Dq start:rate:full
 (``$B3+;O;~(B:$B3NN((B:$B:GBg?t(B'') $B$N7A$r$H$j$^$9(B ($BNc(B: "10:30:60" $B$J$I(B)$B!#(B
@@ -561,14 +563,28 @@
 .Dq start
 ($B$3$NNc$G$O(B 10) $B8D$rD6$($k$H!"$3$l0J8e$N@\B3MW5a$r(B
 .Dq rate/100
-($B$3$NNc$G$O(B 30%) $B$N3NN($G5qH]$7$O$8$a$^$9!#$3$N3NN($O(B
+($B$3$NNc$G$O(B 30%) $B$N3NN($G5qH]$7;O$a$^$9!#$3$N3NN($O(B
 .Dq full
 ($B$3$NNc$G$O(B 60) $B8D$N@\B3$,Mh$k$^$G@~7A$KA}$($D$E$1!"(B
 $B:GBg?t$KC#$7$?;~E@$G$=$l0J9_$9$Y$F$N@\B3$r5qH]$9$k$h$&$K$J$j$^$9!#(B
 .It Cm PasswordAuthentication ($B%Q%9%o!<%IG'>Z(B)
 $B%Q%9%o!<%IG'>Z$r5v2D$9$k$+$I$&$+;XDj$7$^$9!#%G%U%)%k%H$G$O(B
+.Dq no
+$B$G$9$,!"(B
+.Nm sshd
+$B$,(B PAM $B%5%]!<%HL5$7$G9=C[$5$l$F$$$k>l9g$N%G%U%)%k%H$O(B
 .Dq yes
 $B$K$J$C$F$$$^$9!#(B
+.Cm ChallengeResponseAuthentication
+$B$,(B
+.Dq yes
+$B$G$"$j!"(B
+.Nm sshd
+$B$N(B PAM $BG'>Z%]%j%7$K(B
+.Xr pam_unix 8
+$B$,4^$^$l$k>l9g!"(B
+.Cm PasswordAuthentication
+$B$NCM$K4X78$J$/!"%A%c%l%s%8!&%l%9%]%s%95!9=$K$h$k%Q%9%o!<%IG'>Z$,5v2D$5$l$^$9!#(B
 .It Cm PermitEmptyPasswords ($B6u$N%Q%9%o!<%I$r5v2D(B)
 $B%Q%9%o!<%IG'>Z$,5v2D$5$l$F$$$k$H$-!"%Q%9%o!<%IJ8;zNs$,6u$N(B
 $B%"%+%&%s%H$KBP$7$F%5!<%P$,%m%0%$%s$r5v2D$9$k$+$I$&$+;XDj$7$^$9!#(B
@@ -606,16 +622,25 @@
 .Xr ssh 1
 $B$r;H$C$F!"(Broot $B$,%m%0%$%s$G$-$k$+$I$&$+;XDj$7$^$9!#$3$N0z?t$NCM$O(B
 .Dq yes
-$B!"(B 
+$B!"(B
 .Dq without-password
 ($B%Q%9%o!<%IG'>Z$J$7(B)$B!"(B
 .Dq forced-commands-only
 ($B6/@)%3%^%s%I$N$_(B)$B!"$"$k$$$O(B
 .Dq no
-$B$N$$$:$l$+$G$9!#(B
 $B$N$$$:$l$+$K$J$j$^$9!#%G%U%)%k%H$O(B
+.Dq no
+$B$G$9!#(B
+.Cm ChallengeResponseAuthentication
+$B$,(B
 .Dq yes
-$B$G$9!#$3$N@_Dj9`L\$r(B
+$B$N>l9g!"(B
+.Cm PermitRootLogin
+$B$,(B
+.Dq without-password
+$B$K@_Dj$5$l$F$$$?$H$7$F$b!"(Broot $B%f!<%6$O$=$N%Q%9%o!<%I$G5v2D$5$l$^$9!#(B
+.Pp
+$B$3$N@_Dj9`L\$r(B
 .Dq without-password
 $B$K$9$k$H!"(Broot $B$O%Q%9%o!<%IG'>Z$G$O%m%0%$%s$G$-$J$/$J$j$^$9!#(B
 .Pp
@@ -636,23 +661,23 @@
 $B%G%P%$%9$NE>Aw$r5v2D$9$k$+$I$&$+$r;XDj$7$^$9!#(B
 $B$H$j$&$k0z?t$NCM$O(B
 .Dq yes ,
-.Dq point-to-point 
+.Dq point-to-point
 (layer 3),
 .Dq ethernet
 (layer 2) $B$"$k$$$O(B
-.Dq no 
+.Dq no
 $B$G$9!#(B
 .Dq yes
 $B$r;XDj$9$k$H!"(B
 .Dq point-to-point
 $B$*$h$S(B
-.Dq ethernet 
+.Dq ethernet
 $B$NN>J}$r5v2D$7$?$3$H$K$J$j$^$9!#(B
 $B%G%U%)%k%H$O(B
-.Dq no 
+.Dq no
 $B$K$J$C$F$$$^$9!#(B
 .It Cm PermitUserEnvironment ($B%f!<%6$N4D6-JQ?tJQ99$r5v2D$9$k(B)
-.Xr sshd 8 
+.Xr sshd 8
 $B$,(B
 .Pa ~/.ssh/environment
 $B%U%!%$%k$*$h$S(B
@@ -663,7 +688,7 @@
 $B%G%U%)%k%H$G$O(B
 .Dq no
 $B$G$9!#(B
-$B4D6-JQ?t$NJQ99$O!"%f!<%6$K(B 
+$B4D6-JQ?t$NJQ99$O!"%f!<%6$K(B
 .Ev LD_PRELOAD
 $B$J$I$N@_Dj$r;H$C$?(B
 $B$"$k<o$N%"%/%;%9@)8B$r2sHr$5$;$F$7$^$&2DG=@-$,$"$j$^$9!#(B
@@ -676,7 +701,7 @@
 .Xr sshd 8
 $B$,@\B3$r<u$1$D$1$k(B (listen $B$9$k(B) $B%]!<%HHV9f$r;XDj$7$^$9!#(B
 $B%G%U%)%k%H$O(B 22 $B$G$9!#J#?t;XDj$9$k$3$H$b2DG=$G$9!#(B
-.Cm ListenAddress 
+.Cm ListenAddress
 $B$N9`$b;2>H$7$F$/$@$5$$!#(B
 .It Cm PrintLastLog (LastLog $B$NI=<((B)
 $B%f!<%6$,BPOCE*$K%m%0%$%s$7$?$H$-!"(B
@@ -698,11 +723,11 @@
 $B$,%5%]!<%H$9$k%W%m%H%3%k$N%P!<%8%g%s$r;XDj$7$^$9!#(B
 $B$H$j$&$kCM$O(B
 .Sq 1
-$B$H(B 
+$B$H(B
 .Sq 2
-$B$G$9!#J#?t$N%P!<%8%g%s$r%+%s%^$G6h@Z$C$F;XDj$9$k$3$H$b$G$-$^$9!#(B
+$B$G$9!#J#?t$N%P!<%8%g%s$r%3%s%^$G6h@Z$C$F;XDj$9$k$3$H$b$G$-$^$9!#(B
 $B%G%U%)%k%H$O(B
-.Dq 2,1
+.Dq 2
 $B$G$9!#(B
 $B$3$3$G$N%W%m%H%3%k$N=gHV$O!"M%@hEY$r;XDj$9$k$b$N$G$O$J$$$3$H$K(B
 $BCm0U$7$F$/$@$5$$!#$J$<$J$iJ#?t$N%W%m%H%3%k$,%5!<%P$G;HMQ2DG=$J>l9g!"(B
@@ -719,7 +744,8 @@
 $B$3$N@_Dj9`L\$O(B $B%W%m%H%3%k(B $B%P!<%8%g%s(B 2 $B$K$N$_E,MQ$5$l$k$3$H$K(B
 $BCm0U$7$F$/$@$5$$!#(B
 .It Cm RhostsRSAAuthentication (rhosts-RSA $BG'>Z(B)
-RSA $B%[%9%H4VG'>Z$,@.8y$7$F$$$k$H$-!"(Brhosts $B$d(B /etc/hosts.equiv
+RSA $B%[%9%H4VG'>Z$,@.8y$7$F$$$k$H$-!"(Brhosts $B$d(B
+.Pa /etc/hosts.equiv
 $B$r;H$C$?G'>Z$r$*$3$J$C$F$h$$$+$I$&$+;XDj$7$^$9!#%G%U%)%k%H$O(B
 .Dq no
 $B$G$9!#(B
@@ -788,7 +814,7 @@
 .Dq yes
 $B$K$J$C$F$$$^$9!#(B
 .It Cm UseLogin (login $B$N;HMQ(B)
-$BBPOCE*%m%0%$%s%;%C%7%g%s$N$5$$!"(B
+$BBPOCE*%m%0%$%s%;%C%7%g%s$N:]!"(B
 .Xr login 1
 $B%W%m%0%i%`$r;H$&$+$I$&$+$r;XDj$7$^$9!#(B
 $B%G%U%)%k%H$G$O(B
@@ -804,9 +830,11 @@
 $B$O(B
 .Xr xauth 1
 $B%/%C%-!<$N07$$$rCN$i$J$$$+$i$G$9!#(B
+.Cm UsePrivilegeSeparation
+$B$,;XDj$5$l$F$$$k>l9g$O!"G'>Z$N$"$H$G6X;_$5$l$^$9!#(B
 .It Cm UsePAM (PAM $B$N;HMQ(B)
-Pluggable Authentication Module (PAM) $B%$%s%?!<%U%'%$%9$K$h$kG'>Z$r5v2D$7$^$9!#(B
-$B$3$l$,(B 
+Pluggable Authentication Module (PAM) $B%$%s%?%U%'!<%9$K$h$kG'>Z$r5v2D$7$^$9!#(B
+$B$3$l$,(B
 .Dq yes
 $B$K@_Dj$5$l$F$$$k>l9g!"$9$Y$F$NG'>Z7A<0$KBP$7$F(B
 .Cm ChallengeResponseAuthentication
@@ -819,14 +847,12 @@
 .Cm ChallengeResponseAuthentication.
 $B$N$I$A$i$+$r5v2D$9$kI,MW$,$"$j$^$9!#(B
 .Pp
-.CM UsePAM
+.Cm UsePAM
 $B$r5v2D$7$?>l9g!"(B
 sshd $B$r(B root $B0J30$N0lHL%f!<%6$GAv$i$;$k$3$H$O$G$-$^$;$s!#(B
 $B%G%U%)%k%H$O(B
-.Dq no
+.Dq yes
 $B$G$9!#(B
-.Cm UsePrivilegeSeparation
-$B$,;XDj$5$l$F$$$k>l9g$O!"G'>Z$N$"$H$G6X;_$5$l$^$9!#(B
 .It Cm UsePrivilegeSeparation (root$B8"8B$rJ,N%(B)
 .Xr sshd 8
 $B$,!"<u$1$D$1$k%M%C%H%o!<%/%H%i%U%#%C%/$r=hM}$9$k$?$a$K(B
@@ -839,6 +865,12 @@
 $B%G%U%)%k%H$G$O(B
 .Dq yes (root$B8"8B$rJ,N%$9$k(B)
 $B$K$J$C$F$$$^$9!#(B
+.It Cm VersionAddendum ($B%P!<%8%g%s$KIU2C$9$k$b$N(B)
+OS $B$b$7$/$O%5%$%H$KFC2=$7$?=$@5$r<($9$?$a$K!"DL>o$N%P!<%8%g%sJ8;zNs$K(B
+$BIU$12C$($kJ8;zNs$r;XDj$7$^$9!#(B
+$B%G%U%)%k%H$O(B
+.Dq FreeBSD-20061110
+$B$G$9!#(B
 .It Cm X11DisplayOffset (X11 $B%G%#%9%W%l%$HV9f$N%*%U%;%C%HCM(B)
 .Xr sshd 8
 $B$,(B X11 $BE>Aw$r$9$k$H$-$K:G=i$K;H$o$l$k%G%#%9%W%l%$HV9f$r;XDj$7$^$9!#(B
@@ -852,7 +884,7 @@
 $B$"$k$$$O(B
 .Dq no
 $B$G!"%G%U%)%k%H$O(B
-.Dq no
+.Dq yes
 $B$G$9!#(B
 .Pp
 X11 $BE>Aw$,5v2D$5$l$F$*$j!"E>Aw$5$l$?(B
@@ -968,7 +1000,7 @@
 OpenSSH $B$O(B Tatu Ylonen $B$K$h$k!"%U%j!<$J(B
 $B%*%j%8%J%kHG(B ssh 1.2.12 $B%j%j!<%9$+$iGI@8$7$?$b$N$G$9!#(B
 Aaron Campbell$B!"(B Bob Beck$B!"(B Markus Friedl$B!"(B Niels Provos$B!"(B
-Theo de Raadt $B$*$h$S(B Dug Song $B$,B?$/$N%P%0$r$H$j=|$-!"(B
+Theo de Raadt $B$*$h$S(B Dug Song $B$,B?$/$N%P%0$r<h$j=|$-!"(B
 $B?7$7$$5!G=$r$U$?$?$SDI2C$7$F(B OpenSSH $B$r$D$/$j$^$7$?!#(B
 SSH $B%W%m%H%3%k(B $B%P!<%8%g%s(B 1.5 $B$*$h$S(B 2.0 $B$N%5%]!<%H$O(B
 Markus Friedl $B$N9W8%$K$h$k$b$N$G$9!#(B


--Multipart_Mon_Nov_27_23:34:59_2006-1
Content-Type: text/plain; charset=US-ASCII

--- /opt/tmp/openssh-4.5p1/ssh.1	Sun Nov  5 03:31:33 2006
+++ -	Sat Nov 18 17:46:40 2006
@@ -35,6 +35,7 @@
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
 .\" $OpenBSD: ssh.1,v 1.265 2006/10/28 18:08:10 otto Exp $
+.\" $FreeBSD: src/crypto/openssh/ssh.1,v 1.31.2.3 2006/11/11 00:51:28 des Exp $
 .Dd September 25, 1999
 .Dt SSH 1
 .Os
@@ -495,6 +496,7 @@
 .It User
 .It UserKnownHostsFile
 .It VerifyHostKeyDNS
+.It VersionAddendum
 .It XAuthLocation
 .El
 .It Fl p Ar port
--- /opt/tmp/openssh-4.5p1/ssh_config.5	Sat Aug  5 10:34:51 2006
+++ -	Sat Nov 18 17:46:41 2006
@@ -35,6 +35,7 @@
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
 .\" $OpenBSD: ssh_config.5,v 1.97 2006/07/27 08:00:50 jmc Exp $
+.\" $FreeBSD: src/crypto/openssh/ssh_config.5,v 1.17.2.4 2006/11/11 00:51:28 des Exp $
 .Dd September 25, 1999
 .Dt SSH_CONFIG 5
 .Os
@@ -165,7 +166,7 @@
 .Dq no ,
 the check will not be executed.
 The default is
-.Dq yes .
+.Dq no .
 .It Cm Cipher
 Specifies the cipher to use for encrypting the session
 in protocol version 1.
@@ -1035,6 +1036,11 @@
 .Sx VERIFYING HOST KEYS
 in
 .Xr ssh 1 .
+.It Cm VersionAddendum
+Specifies a string to append to the regular version string to identify
+OS- or site-specific modifications.
+The default is
+.Dq FreeBSD-20061110 .
 .It Cm XAuthLocation
 Specifies the full pathname of the
 .Xr xauth 1
--- /opt/tmp/openssh-4.5p1/sshd.8	Wed Aug 30 10:07:01 2006
+++ -	Sat Nov 18 17:46:42 2006
@@ -35,6 +35,7 @@
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
 .\" $OpenBSD: sshd.8,v 1.234 2006/08/21 08:15:57 dtucker Exp $
+.\" $FreeBSD: src/crypto/openssh/sshd.8,v 1.31.2.2 2006/10/06 14:07:17 des Exp $
 .Dd September 25, 1999
 .Dt SSHD 8
 .Os
@@ -65,7 +66,7 @@
 .Nm
 listens for connections from clients.
 It is normally started at boot from
-.Pa /etc/rc .
+.Pa /etc/rc.d/sshd .
 It forks a new
 daemon for each incoming connection.
 The forked daemons handle
@@ -138,8 +139,6 @@
 The default is
 .Pa /etc/ssh/ssh_host_key
 for protocol version 1, and
-.Pa /etc/ssh/ssh_host_rsa_key
-and
 .Pa /etc/ssh/ssh_host_dsa_key
 for protocol version 2.
 It is possible to have multiple host key files for
@@ -342,8 +341,9 @@
 If the login is on a tty, records login time.
 .It
 Checks
-.Pa /etc/nologin ;
-if it exists, prints contents and quits
+.Pa /etc/nologin and
+.Pa /var/run/nologin ;
+if one exists, it prints the contents and quits
 (unless root).
 .It
 Changes to run with normal user privileges.
@@ -365,7 +365,8 @@
 exists, runs it; else if
 .Pa /etc/ssh/sshrc
 exists, runs
-it; otherwise runs xauth.
+it; otherwise runs
+.Xr xauth 1 .
 The
 .Dq rc
 files are given the X11
--- /opt/tmp/openssh-4.5p1/sshd_config.5	Wed Aug 30 10:06:34 2006
+++ -	Sat Nov 18 17:46:41 2006
@@ -35,6 +35,7 @@
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
 .\" $OpenBSD: sshd_config.5,v 1.70 2006/08/21 08:14:01 dtucker Exp $
+.\" $FreeBSD: src/crypto/openssh/sshd_config.5,v 1.23.2.4 2006/11/11 00:51:28 des Exp $
 .Dd September 25, 1999
 .Dt SSHD_CONFIG 5
 .Os
@@ -169,9 +170,16 @@
 By default, no banner is displayed.
 .It Cm ChallengeResponseAuthentication
 Specifies whether challenge-response authentication is allowed.
-All authentication styles from
-.Xr login.conf 5
-are supported.
+Specifically, in
+.Fx ,
+this controls the use of PAM (see
+.Xr pam 3 )
+for authentication.
+Note that this affects the effectiveness of the
+.Cm PasswordAuthentication
+and
+.Cm PermitRootLogin
+variables.
 The default is
 .Dq yes .
 .It Cm Ciphers
@@ -358,8 +366,6 @@
 The default is
 .Pa /etc/ssh/ssh_host_key
 for protocol version 1, and
-.Pa /etc/ssh/ssh_host_rsa_key
-and
 .Pa /etc/ssh/ssh_host_dsa_key
 for protocol version 2.
 Note that
@@ -384,7 +390,7 @@
 .Pp
 .Pa /etc/hosts.equiv
 and
-.Pa /etc/shosts.equiv
+.Pa /etc/ssh/shosts.equiv 
 are still used.
 The default is
 .Dq yes .
@@ -554,7 +560,22 @@
 .It Cm PasswordAuthentication
 Specifies whether password authentication is allowed.
 The default is
+.Dq no ,
+unless
+.Nm sshd
+was built without PAM support, in which case the default is
 .Dq yes .
+Note that if
+.Cm ChallengeResponseAuthentication
+is
+.Dq yes ,
+and the PAM authentication policy for
+.Nm sshd
+includes
+.Xr pam_unix 8 ,
+password authentication will be allowed through the challenge-response
+mechanism regardless of the value of
+.Cm PasswordAuthentication .
 .It Cm PermitEmptyPasswords
 When password authentication is allowed, it specifies whether the
 server allows login to accounts with empty password strings.
@@ -597,7 +618,14 @@
 or
 .Dq no .
 The default is
-.Dq yes .
+.Dq no .
+Note that if
+.Cm ChallengeResponseAuthentication
+is
+.Dq yes ,
+the root user may be allowed in with its password even if
+.Cm PermitRootLogin is set to
+.Dq without-password .
 .Pp
 If this option is set to
 .Dq without-password ,
@@ -690,7 +718,7 @@
 .Sq 2 .
 Multiple versions must be comma-separated.
 The default is
-.Dq 2,1 .
+.Dq 2 .
 Note that the order of the protocol list does not indicate preference,
 because the client selects among multiple protocol versions offered
 by the server.
@@ -704,7 +732,9 @@
 .Dq yes .
 Note that this option applies to protocol version 2 only.
 .It Cm RhostsRSAAuthentication
-Specifies whether rhosts or /etc/hosts.equiv authentication together
+Specifies whether rhosts or
+.Pa /etc/hosts.equiv
+authentication together
 with successful RSA host authentication is allowed.
 The default is
 .Dq no .
@@ -814,7 +844,7 @@
 .Xr sshd 8
 as a non-root user.
 The default is
-.Dq no .
+.Dq yes .
 .It Cm UsePrivilegeSeparation
 Specifies whether
 .Xr sshd 8
@@ -826,6 +856,11 @@
 escalation by containing any corruption within the unprivileged processes.
 The default is
 .Dq yes .
+.It Cm VersionAddendum
+Specifies a string to append to the regular version string to identify
+OS- or site-specific modifications.
+The default is
+.Dq FreeBSD-20061110 .
 .It Cm X11DisplayOffset
 Specifies the first display number available for
 .Xr sshd 8 Ns 's
@@ -839,7 +874,7 @@
 or
 .Dq no .
 The default is
-.Dq no .
+.Dq yes .
 .Pp
 When X11 forwarding is enabled, there may be additional exposure to
 the server and to client displays if the

--Multipart_Mon_Nov_27_23:34:59_2006-1--
