2 files changed, 10 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index a4ed90296..3af392c02 100644
--- 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
@@ -4383,4 +4387,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.5015 2008/06/15 21:53:16 djm Exp $
+$Id: ChangeLog,v 1.5016 2008/06/15 21:55:06 djm Exp $
diff --git a/scp.1 b/scp.1
index 7122fa40f..0c29c9fe8 100644
--- a/scp.1
+++ b/scp.1
@@ -10,8 +10,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.45 2008/06/14 19:42:10 dtucker Exp $
 .\"
-.Dd $Mdocdate: January 31 2008 $
+.Dd $Mdocdate: June 14 2008 $
 .Dt SCP 1
 .Os
 .Sh NAME
@@ -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