- jmc@cvs.openbsd.org 2008/01/31 20:06:50

     [scp.1]
     explain how to handle local file names containing colons;
     requested by Tamas TEVESZ
     ok dtucker

diff --git a/ChangeLog b/ChangeLog
index 497172fa467c41115e5751f67c91f7b81c3643b2..72607ed90ebfa5d6795a936936e254ad0c5fab06 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -63,6 +63,11 @@
      Revert the change for bz #1307 as it causes connection aborts if an IGNORE
      packet arrives while we're waiting in packet_read_expect (and possibly
      elsewhere).
+   - jmc@cvs.openbsd.org 2008/01/31 20:06:50
+     [scp.1]
+     explain how to handle local file names containing colons;
+     requested by Tamas TEVESZ
+     ok dtucker
 
 20080119
  - (djm) Silence noice from expr in ssh-copy-id; patch from

diff --git a/scp.1 b/scp.1
index 8746e29df2847699bf8ea25cbca3a65edd7f0cea..612846e25685c552045e85d79513aa4e0402a183 100644 (file)
--- a/scp.1
+++ b/scp.1
@@ -9,7 +9,7 @@
 .\"
 .\" Created: Sun May  7 00:14:37 1995 ylo
 .\"
-.\" $OpenBSD: scp.1,v 1.43 2008/01/19 19:25:50 djm Exp $
+.\" $OpenBSD: scp.1,v 1.44 2008/01/31 20:06:50 jmc Exp $
 .\"
 .Dd $Mdocdate$
 .Dt SCP 1
@@ -56,9 +56,15 @@ Unlike
 will ask for passwords or passphrases if they are needed for
 authentication.
 .Pp
-Any file name may contain a host and user specification to indicate
+File names may contain a user and host specification to indicate
 that the file is to be copied to/from that host.
-Copies between two remote hosts are permitted.
+Local file names can be made explicit using absolute or relative pathnames
+to avoid
+.Nm
+treating file names containing
+.Sq :\&
+as host specifiers.
+Copies between two remote hosts are also permitted.
 .Pp
 The options are as follows:
 .Bl -tag -width Ds