summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--scp.13
-rw-r--r--sftp.13
3 files changed, 9 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 3165f1225..538e2e3b3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -18,6 +18,10 @@
18 - jmc@cvs.openbsd.org 2005/03/01 15:47:14 18 - jmc@cvs.openbsd.org 2005/03/01 15:47:14
19 [ssh-keyscan.1 ssh-keyscan.c] 19 [ssh-keyscan.1 ssh-keyscan.c]
20 sort options and sync usage(); 20 sort options and sync usage();
21 - jmc@cvs.openbsd.org 2005/03/01 17:19:35
22 [scp.1 sftp.1]
23 add HashKnownHosts to -o list;
24 ok markus@
21 25
2220050301 2620050301
23 - (djm) OpenBSD CVS sync: 27 - (djm) OpenBSD CVS sync:
@@ -2237,4 +2241,4 @@
2237 - (djm) Trim deprecated options from INSTALL. Mention UsePAM 2241 - (djm) Trim deprecated options from INSTALL. Mention UsePAM
2238 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu 2242 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
2239 2243
2240$Id: ChangeLog,v 1.3680 2005/03/02 01:04:01 djm Exp $ 2244$Id: ChangeLog,v 1.3681 2005/03/02 01:04:16 djm Exp $
diff --git a/scp.1 b/scp.1
index 30049c2b6..b5191e318 100644
--- a/scp.1
+++ b/scp.1
@@ -9,7 +9,7 @@
9.\" 9.\"
10.\" Created: Sun May 7 00:14:37 1995 ylo 10.\" Created: Sun May 7 00:14:37 1995 ylo
11.\" 11.\"
12.\" $OpenBSD: scp.1,v 1.37 2004/10/07 10:10:24 djm Exp $ 12.\" $OpenBSD: scp.1,v 1.38 2005/03/01 17:19:35 jmc Exp $
13.\" 13.\"
14.Dd September 25, 1999 14.Dd September 25, 1999
15.Dt SCP 1 15.Dt SCP 1
@@ -133,6 +133,7 @@ For full details of the options listed below, and their possible values, see
133.It GlobalKnownHostsFile 133.It GlobalKnownHostsFile
134.It GSSAPIAuthentication 134.It GSSAPIAuthentication
135.It GSSAPIDelegateCredentials 135.It GSSAPIDelegateCredentials
136.It HashKnownHosts
136.It Host 137.It Host
137.It HostbasedAuthentication 138.It HostbasedAuthentication
138.It HostKeyAlgorithms 139.It HostKeyAlgorithms
diff --git a/sftp.1 b/sftp.1
index bcd7fdf78..c89ffc30f 100644
--- a/sftp.1
+++ b/sftp.1
@@ -1,4 +1,4 @@
1.\" $OpenBSD: sftp.1,v 1.60 2004/12/05 23:55:07 jaredy Exp $ 1.\" $OpenBSD: sftp.1,v 1.61 2005/03/01 17:19:35 jmc Exp $
2.\" 2.\"
3.\" Copyright (c) 2001 Damien Miller. All rights reserved. 3.\" Copyright (c) 2001 Damien Miller. All rights reserved.
4.\" 4.\"
@@ -161,6 +161,7 @@ For full details of the options listed below, and their possible values, see
161.It GlobalKnownHostsFile 161.It GlobalKnownHostsFile
162.It GSSAPIAuthentication 162.It GSSAPIAuthentication
163.It GSSAPIDelegateCredentials 163.It GSSAPIDelegateCredentials
164.It HashKnownHosts
164.It Host 165.It Host
165.It HostbasedAuthentication 166.It HostbasedAuthentication
166.It HostKeyAlgorithms 167.It HostKeyAlgorithms