summaryrefslogtreecommitdiff
path: root/scp.1
diff options
context:
space:
mode:
authorColin Watson <cjwatson@debian.org>2009-12-29 21:42:53 +0000
committerColin Watson <cjwatson@debian.org>2009-12-29 21:42:53 +0000
commit87552344215a38d3a2b0d4d63dc151e05978bbe1 (patch)
tree9f4b96055e6ccaa915e8d59d9f2805e9e119371d /scp.1
parenta25ec0b132c44c9e341e08464ff830de06b81126 (diff)
parentef94e5613d37bcbf880f21ee6094e4b1c7683a4c (diff)
import openssh-5.1p1-gsskex-cjwatson-20080722.patch
Diffstat (limited to 'scp.1')
-rw-r--r--scp.123
1 files changed, 17 insertions, 6 deletions
diff --git a/scp.1 b/scp.1
index b37ac84be..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.42 2007/08/06 19:16:06 sobrado Exp $ 12.\" $OpenBSD: scp.1,v 1.46 2008/07/12 05:33:41 djm Exp $
13.\" 13.\"
14.Dd $Mdocdate: August 8 2007 $ 14.Dd $Mdocdate: July 12 2008 $
15.Dt SCP 1 15.Dt SCP 1
16.Os 16.Os
17.Sh NAME 17.Sh NAME
@@ -56,9 +56,15 @@ Unlike
56will ask for passwords or passphrases if they are needed for 56will ask for passwords or passphrases if they are needed for
57authentication. 57authentication.
58.Pp 58.Pp
59Any file name may contain a host and user specification to indicate 59File names may contain a user and host specification to indicate
60that the file is to be copied to/from that host. 60that the file is to be copied to/from that host.
61Copies between two remote hosts are permitted. 61Local file names can be made explicit using absolute or relative pathnames
62to avoid
63.Nm
64treating file names containing
65.Sq :\&
66as host specifiers.
67Copies between two remote hosts are also permitted.
62.Pp 68.Pp
63The options are as follows: 69The options are as follows:
64.Bl -tag -width Ds 70.Bl -tag -width Ds
@@ -98,7 +104,7 @@ per-user configuration file for
98This option is directly passed to 104This option is directly passed to
99.Xr ssh 1 . 105.Xr ssh 1 .
100.It Fl i Ar identity_file 106.It Fl i Ar identity_file
101Selects the file from which the identity (private key) for RSA 107Selects the file from which the identity (private key) for public key
102authentication is read. 108authentication is read.
103This option is directly passed to 109This option is directly passed to
104.Xr ssh 1 . 110.Xr ssh 1 .
@@ -178,9 +184,14 @@ is already reserved for preserving the times and modes of the file in
178Preserves modification times, access times, and modes from the 184Preserves modification times, access times, and modes from the
179original file. 185original file.
180.It Fl q 186.It Fl q
181Disables the progress meter. 187Quiet mode: disables the progress meter as well as warning and diagnostic
188messages from
189.Xr ssh 1 .
182.It Fl r 190.It Fl r
183Recursively copy entire directories. 191Recursively copy entire directories.
192Note that
193.Nm
194follows symbolic links encountered in the tree traversal.
184.It Fl S Ar program 195.It Fl S Ar program
185Name of 196Name of
186.Ar program 197.Ar program