From 3f166dfcb553eacf46b3a02e72c26651d79471ef Mon Sep 17 00:00:00 2001 From: Darren Tucker Date: Wed, 9 Feb 2005 09:46:47 +1100 Subject: [PATCH] - dtucker@cvs.openbsd.org 2005/01/28 09:45:53 [ssh_config] Make it clear that the example entries in ssh_config are only some of the commonly-used options and refer the user to ssh_config(5) for more details; ok djm@ --- ChangeLog | 10 +++++++++- ssh_config | 6 ++++-- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 60e5374ee..3d7f5806b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +20050209 + - (dtucker) OpenBSD CVS Sync + - dtucker@cvs.openbsd.org 2005/01/28 09:45:53 + [ssh_config] + Make it clear that the example entries in ssh_config are only some of the + commonly-used options and refer the user to ssh_config(5) for more + details; ok djm@ + 20050208 - (dtucker) [regress/test-exec.sh] Bug #912: Set _POSIX2_VERSION for the regress tests so newer versions of GNU head(1) behave themselves. Patch @@ -2086,4 +2094,4 @@ - (djm) Trim deprecated options from INSTALL. Mention UsePAM - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu -$Id: ChangeLog,v 1.3639 2005/02/08 10:52:47 dtucker Exp $ +$Id: ChangeLog,v 1.3640 2005/02/08 22:46:47 dtucker Exp $ diff --git a/ssh_config b/ssh_config index 2692e8913..f41bee0a2 100644 --- a/ssh_config +++ b/ssh_config @@ -1,4 +1,4 @@ -# $OpenBSD: ssh_config,v 1.19 2003/08/13 08:46:31 markus Exp $ +# $OpenBSD: ssh_config,v 1.20 2005/01/28 09:45:53 dtucker Exp $ # This is the ssh client system-wide configuration file. See # ssh_config(5) for more information. This file provides defaults for @@ -13,7 +13,9 @@ # Thus, host-specific definitions should be at the beginning of the # configuration file, and defaults at the end. -# Site-wide defaults for various options +# Site-wide defaults for some commonly used options. For a comprehensive +# list of available options, their meanings and defaults, please see the +# ssh_config(5) man page. # Host * # ForwardAgent no