summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog7
-rw-r--r--scp.19
2 files changed, 12 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 302c73815..c249761d7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,11 @@
4 - markus@cvs.openbsd.org 2001/08/07 10:37:46 4 - markus@cvs.openbsd.org 2001/08/07 10:37:46
5 [authfd.c authfd.h] 5 [authfd.c authfd.h]
6 extended failure messages from galb@vandyke.com 6 extended failure messages from galb@vandyke.com
7 - deraadt@cvs.openbsd.org 2001/08/08 07:16:58
8 [scp.1]
9 when describing the -o option, give -o Protocol=1 as the specific example
10 since we are SICK AND TIRED of clueless people who cannot have difficulty
11 thinking on their own.
7 12
820010814 1320010814
9 - (stevesk) sshpty.c, cray.[ch]: whitespace, formatting and cleanup 14 - (stevesk) sshpty.c, cray.[ch]: whitespace, formatting and cleanup
@@ -6293,4 +6298,4 @@
6293 - Wrote replacements for strlcpy and mkdtemp 6298 - Wrote replacements for strlcpy and mkdtemp
6294 - Released 1.0pre1 6299 - Released 1.0pre1
6295 6300
6296$Id: ChangeLog,v 1.1476 2001/08/15 23:04:50 mouring Exp $ 6301$Id: ChangeLog,v 1.1477 2001/08/15 23:06:59 mouring Exp $
diff --git a/scp.1 b/scp.1
index 235658342..395ffdf88 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.15 2001/07/29 17:02:46 mouring Exp $ 12.\" $OpenBSD: scp.1,v 1.16 2001/08/08 07:16:58 deraadt Exp $
13.\" 13.\"
14.Dd September 25, 1999 14.Dd September 25, 1999
15.Dt SCP 1 15.Dt SCP 1
@@ -109,8 +109,11 @@ The program must understand
109options. 109options.
110.It Fl o Ar option 110.It Fl o Ar option
111Can be used to give options in the format used in the config file. 111Can be used to give options in the format used in the config file.
112Theses options are passed directly to 112These options are passed directly to
113.Xr ssh 1 . 113.Xr ssh 1 ,
114for instance
115.Fl o "Protocol=1"
116would force protocol 1.
114.It Fl 4 117.It Fl 4
115Forces 118Forces
116.Nm 119.Nm