summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--scp.16
2 files changed, 8 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 6244e39b5..a3b7eb02d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,10 @@
4 [channels.c] 4 [channels.c]
5 unbreak; move clearing of cctx struct to before first use 5 unbreak; move clearing of cctx struct to before first use
6 reported by dkrause@ 6 reported by dkrause@
7 - djm@cvs.openbsd.org 2008/07/12 05:33:41
8 [scp.1]
9 better description for -i flag:
10 s/RSA authentication/public key authentication/
7 11
820080711 1220080711
9 - (djm) OpenBSD CVS Sync 13 - (djm) OpenBSD CVS Sync
@@ -4629,4 +4633,4 @@
4629 OpenServer 6 and add osr5bigcrypt support so when someone migrates 4633 OpenServer 6 and add osr5bigcrypt support so when someone migrates
4630 passwords between UnixWare and OpenServer they will still work. OK dtucker@ 4634 passwords between UnixWare and OpenServer they will still work. OK dtucker@
4631 4635
4632$Id: ChangeLog,v 1.5074 2008/07/12 07:12:29 djm Exp $ 4636$Id: ChangeLog,v 1.5075 2008/07/12 07:12:49 djm Exp $
diff --git a/scp.1 b/scp.1
index ede88fd15..5033d84f2 100644
--- a/scp.1
+++ b/scp.1
@@ -9,9 +9,9 @@
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.45 2008/06/14 19:42:10 dtucker Exp $ 12.\" $OpenBSD: scp.1,v 1.46 2008/07/12 05:33:41 djm Exp $
13.\" 13.\"
14.Dd $Mdocdate: June 14 2008 $ 14.Dd $Mdocdate: July 12 2008 $
15.Dt SCP 1 15.Dt SCP 1
16.Os 16.Os
17.Sh NAME 17.Sh NAME
@@ -104,7 +104,7 @@ per-user configuration file for
104This option is directly passed to 104This option is directly passed to
105.Xr ssh 1 . 105.Xr ssh 1 .
106.It Fl i Ar identity_file 106.It Fl i Ar identity_file
107Selects the file from which the identity (private key) for RSA 107Selects the file from which the identity (private key) for public key
108authentication is read. 108authentication is read.
109This option is directly passed to 109This option is directly passed to
110.Xr ssh 1 . 110.Xr ssh 1 .