2 files changed, 16 insertions, 5 deletions

diff --git a/ChangeLog b/ChangeLog
index d6655ba1f..81ebc742b 100644
--- 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
@@ -3591,4 +3596,4 @@
    OpenServer 6 and add osr5bigcrypt support so when someone migrates
    passwords between UnixWare and OpenServer they will still work. OK dtucker@
 
-$Id: ChangeLog,v 1.4832 2008/02/10 11:27:47 djm Exp $
+$Id: ChangeLog,v 1.4833 2008/02/10 11:28:45 djm Exp $
diff --git a/scp.1 b/scp.1
index 46b72eda3..7122fa40f 100644
--- a/scp.1
+++ b/scp.1
@@ -9,9 +9,9 @@
 .\"
 .\" 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: January 19 2008 $
+.Dd $Mdocdate: January 31 2008 $
 .Dt SCP 1
 .Os
 .Sh NAME
@@ -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