summaryrefslogtreecommitdiffstats
path: root/crypto/openssh/ssh_config.5
diff options
context:
space:
mode:
authordes <des@FreeBSD.org>2010-04-28 10:36:33 +0000
committerdes <des@FreeBSD.org>2010-04-28 10:36:33 +0000
commitfc607a2e80dfeb125ae2fe83191d934929997047 (patch)
treebd00e72572bcfba5ac7d243462c79d29a987c5a2 /crypto/openssh/ssh_config.5
parentc86e821ecb2a324088edbbb87198b4d55833575a (diff)
downloadFreeBSD-src-fc607a2e80dfeb125ae2fe83191d934929997047.zip
FreeBSD-src-fc607a2e80dfeb125ae2fe83191d934929997047.tar.gz
Upgrade to OpenSSH 5.5p1.
Diffstat (limited to 'crypto/openssh/ssh_config.5')
-rw-r--r--crypto/openssh/ssh_config.512
1 files changed, 4 insertions, 8 deletions
diff --git a/crypto/openssh/ssh_config.5 b/crypto/openssh/ssh_config.5
index 0f67fdc..88afdad 100644
--- a/crypto/openssh/ssh_config.5
+++ b/crypto/openssh/ssh_config.5
@@ -34,9 +34,9 @@
.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
.\"
-.\" $OpenBSD: ssh_config.5,v 1.129 2010/03/05 10:28:21 djm Exp $
+.\" $OpenBSD: ssh_config.5,v 1.130 2010/03/26 01:06:13 dtucker Exp $
.\" $FreeBSD$
-.Dd March 5 2010
+.Dd March 26 2010
.Dt SSH_CONFIG 5
.Os
.Sh NAME
@@ -735,11 +735,7 @@ This allows a client to prefer one method (e.g.\&
over another method (e.g.\&
.Cm password )
The default for this option is:
-.Do gssapi-with-mic ,
-hostbased,
-publickey,
-keyboard-interactive,
-password
+.Do gssapi-with-mic,hostbased,publickey,keyboard-interactive,password
.Dc .
.It Cm Protocol
Specifies the protocol versions
@@ -1087,7 +1083,7 @@ in
Specifies a string to append to the regular version string to identify
OS- or site-specific modifications.
The default is
-.Dq FreeBSD-20100308 .
+.Dq FreeBSD-20100428 .
.It Cm VisualHostKey
If this flag is set to
.Dq yes ,
OpenPOWER on IntegriCloud