From 94299ec251c84fb07329f3322cd5d6390d70eb7d Mon Sep 17 00:00:00 2001 From: Darren Tucker Date: Fri, 20 Jan 2006 11:30:14 +1100 Subject: [PATCH] - jmc@cvs.openbsd.org 2006/01/15 17:37:05 [ssh.1] correction from deraadt --- ChangeLog | 8 +++++++- ssh.1 | 4 ++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8cb8fd131..d550404a7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +20060120 + - (dtucker) OpenBSD CVS Sync + - jmc@cvs.openbsd.org 2006/01/15 17:37:05 + [ssh.1] + correction from deraadt + 20060114 - (djm) OpenBSD CVS Sync - jmc@cvs.openbsd.org 2006/01/06 13:27:32 @@ -3705,4 +3711,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.4090 2006/01/13 23:10:31 djm Exp $ +$Id: ChangeLog,v 1.4091 2006/01/20 00:30:14 dtucker Exp $ diff --git a/ssh.1 b/ssh.1 index 59694822a..59ec74b3f 100644 --- a/ssh.1 +++ b/ssh.1 @@ -34,7 +34,7 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" $OpenBSD: ssh.1,v 1.248 2006/01/12 22:34:12 jmc Exp $ +.\" $OpenBSD: ssh.1,v 1.249 2006/01/15 17:37:05 jmc Exp $ .Dd September 25, 1999 .Dt SSH 1 .Os @@ -643,7 +643,7 @@ The file format and configuration options are described in exits with the exit status of the remote command or with 255 if an error occurred. .Sh AUTHENTICATION -The OpenSSH SSH client supports OpenSSH protocols 1 and 2. +The OpenSSH SSH client supports SSH protocols 1 and 2. Protocol 2 is the default, with .Nm falling back to protocol 1 if it detects protocol 2 is unsupported.