Import of OpenSSH 5.1p1

[gssapi-openssh.git] / openssh / scp.1

diff --git a/openssh/scp.1 b/openssh/scp.1
index a8bd97f21a786e60476544a80e56a96100dccddb..5033d84f2227bb9eb7d4fd78757f963d63379be1 100644 (file)
--- a/openssh/scp.1
+++ b/openssh/scp.1
@@ -9,9 +9,9 @@
 .\"
 .\" Created: Sun May  7 00:14:37 1995 ylo
 .\"
-.\" $OpenBSD: scp.1,v 1.44 2008/01/31 20:06:50 jmc Exp $
+.\" $OpenBSD: scp.1,v 1.46 2008/07/12 05:33:41 djm Exp $
 .\"
-.Dd $Mdocdate: February 10 2008 $
+.Dd $Mdocdate: July 12 2008 $
 .Dt SCP 1
 .Os
 .Sh NAME
@@ -104,7 +104,7 @@ per-user configuration file for
 This option is directly passed to
 .Xr ssh 1 .
 .It Fl i Ar identity_file
-Selects the file from which the identity (private key) for RSA
+Selects the file from which the identity (private key) for public key
 authentication is read.
 This option is directly passed to
 .Xr ssh 1 .
@@ -189,6 +189,9 @@ messages from
 .Xr ssh 1 .
 .It Fl r
 Recursively copy entire directories.
+Note that
+.Nm
+follows symbolic links encountered in the tree traversal.
 .It Fl S Ar program
 Name of
 .Ar program