import openssh-5.1p1-gsskex-cjwatson-20080722.patch

1 files changed, 12 insertions, 8 deletions

diff --git a/scp.0 b/scp.0
index 012d4f0ad..b6b9d919c 100644
--- a/scp.0
+++ b/scp.0
@@ -14,9 +14,11 @@ DESCRIPTION
      as ssh(1).  Unlike rcp(1), scp will ask for passwords or passphrases if
      they are needed for authentication.
 
-     Any file name may contain a host and user specification to indicate that
-     the file is to be copied to/from that host.  Copies between two remote
-     hosts are permitted.
+     File names may contain a user and host specification to indicate that the
+     file is to be copied to/from that host.  Local file names can be made ex-
+     plicit using absolute or relative pathnames to avoid scp treating file
+     names containing `:' as host specifiers.  Copies between two remote hosts
+     are also permitted.
 
      The options are as follows:
 
@@ -43,8 +45,8 @@ DESCRIPTION
              This option is directly passed to ssh(1).
 
      -i identity_file
-             Selects the file from which the identity (private key) for RSA
-             authentication is read.  This option is directly passed to
+             Selects the file from which the identity (private key) for public
+             key authentication is read.  This option is directly passed to
              ssh(1).
 
      -l limit
@@ -115,9 +117,11 @@ DESCRIPTION
      -p      Preserves modification times, access times, and modes from the
              original file.
 
-     -q      Disables the progress meter.
+     -q      Quiet mode: disables the progress meter as well as warning and
+             diagnostic messages from ssh(1).
 
-     -r      Recursively copy entire directories.
+     -r      Recursively copy entire directories.  Note that scp follows sym-
+             bolic links encountered in the tree traversal.
 
      -S program
              Name of program to use for the encrypted connection.  The program
@@ -141,4 +145,4 @@ AUTHORS
      Timo Rinne <tri@iki.fi>
      Tatu Ylonen <ylo@cs.hut.fi>
 
-OpenBSD 4.2                     August 8, 2007                               3
+OpenBSD 4.4                      July 12, 2008                               3