- markus@cvs.openbsd.org 2002/01/11 13:39:36

[openssh.git] / scp.1

diff --git a/scp.1 b/scp.1
index 54ca0f4bf375517a49c561e6a104bfbf51030c4f..d51e680c77796f8894e7271ac95c3ab5334d2225 100644 (file)
--- a/scp.1
+++ b/scp.1
@@ -9,7 +9,7 @@
 .\"
 .\" Created: Sun May  7 00:14:37 1995 ylo
 .\"
-.\" $Id$
+.\" $OpenBSD: scp.1,v 1.20 2001/09/17 23:56:07 stevesk Exp $
 .\"
 .Dd September 25, 1999
 .Dt SCP 1
@@ -19,10 +19,13 @@
 .Nd secure copy (remote file copy program)
 .Sh SYNOPSIS
 .Nm scp
-.Op Fl pqrvC46
+.Op Fl pqrvBC46
+.Op Fl F Ar ssh_config
+.Op Fl S Ar program
 .Op Fl P Ar port
 .Op Fl c Ar cipher
 .Op Fl i Ar identity_file
+.Op Fl o Ar ssh_option
 .Sm off
 .Oo
 .Op Ar user@
@@ -68,11 +71,6 @@ This option is directly passed to
 .It Fl p
 Preserves modification times, access times, and modes from the
 original file.
-.It Fl S
-Name of program to use for the encrypted connection.
-The program must understand
-.Xr ssh 1
-options.
 .It Fl r
 Recursively copy entire directories.
 .It Fl v
@@ -95,6 +93,12 @@ Passes the
 flag to
 .Xr ssh 1
 to enable compression.
+.It Fl F Ar ssh_config
+Specifies an alternative
+per-user configuration file for
+.Nm ssh .
+This option is directly passed to
+.Xr ssh 1 .
 .It Fl P Ar port
 Specifies the port to connect to on the remote host.
 Note that this option is written with a capital
@@ -103,11 +107,24 @@ because
 .Fl p
 is already reserved for preserving the times and modes of the file in
 .Xr rcp 1 .
-.It Fl S
-Name of program to use for the encrypted connection. The program must 
-understand
+.It Fl S Ar program
+Name of
+.Ar program
+to use for the encrypted connection.
+The program must understand
 .Xr ssh 1
 options.
+.It Fl o Ar ssh_option
+Can be used to pass options to
+.Nm ssh
+in the format used in the
+.Xr ssh 1
+configuration file. This is useful for specifying options
+for which there is no separate
+.Nm scp
+command-line flag.  For example, forcing the use of protocol
+version 1 is specified using
+.Ic scp -oProtocol=1 .
 .It Fl 4
 Forces
 .Nm
@@ -127,6 +144,7 @@ program in BSD source code from the Regents of the University of
 California.
 .Sh SEE ALSO
 .Xr rcp 1 ,
+.Xr sftp 1 ,
 .Xr ssh 1 ,
 .Xr ssh-add 1 ,
 .Xr ssh-agent 1 ,