- dtucker@cvs.openbsd.org 2008/06/14 19:42:10

     [scp.1]
     Mention that scp follows symlinks during -r.  bz #1466,
     from nectar at apple

diff --git a/ChangeLog b/ChangeLog
index c2209b368c9153a2acd0423c4e1123298f891cd5..aeee385e499d2b3269948c3f9e29f1f8c7095179 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -11,6 +11,10 @@
      [session.c]
      suppress the warning message from chdir(homedir) failures
      when chrooted (bz#1461); ok dtucker
+   - dtucker@cvs.openbsd.org 2008/06/14 19:42:10
+     [scp.1]
+     Mention that scp follows symlinks during -r.  bz #1466,
+     from nectar at apple
 
 20080614
  - (djm) [openbsd-compat/sigact.c] Avoid NULL derefs in ancient sigaction

diff --git a/scp.1 b/scp.1
index 612846e25685c552045e85d79513aa4e0402a183..be9a05b398272fb98ece085d7b6956a1c9a74aa8 100644 (file)
--- a/scp.1
+++ b/scp.1
@@ -10,6 +10,7 @@
 .\" 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.45 2008/06/14 19:42:10 dtucker Exp $
 .\"
 .Dd $Mdocdate$
 .Dt SCP 1
@@ -189,6 +190,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