2 files changed, 10 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index 5201e5a2e..440b06e54 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,6 +7,10 @@
    - dtucker@cvs.openbsd.org 2011/05/06 01:03:35
      [sshd_config]
      clarify language about overriding defaults.  bz#1892, from Petr Cerny
+   - djm@cvs.openbsd.org 2011/05/06 01:09:53
+     [sftp.1]
+     mention that IPv6 addresses must be enclosed in square brackets;
+     bz#1845
 
 20110510
  - (dtucker) [openbsd-compat/openssl-compat.{c,h}] Bug #1882: fix
diff --git a/sftp.1 b/sftp.1
index 89b5d3544..3b6ee3890 100644
--- a/sftp.1
+++ b/sftp.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: sftp.1,v 1.88 2010/12/04 00:18:01 djm Exp $
+.\" $OpenBSD: sftp.1,v 1.89 2011/05/06 01:09:53 djm Exp $
 .\"
 .\" Copyright (c) 2001 Damien Miller.  All rights reserved.
 .\"
@@ -22,7 +22,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: December 4 2010 $
+.Dd $Mdocdate: May 6 2011 $
 .Dt SFTP 1
 .Os
 .Sh NAME
@@ -89,6 +89,10 @@ to obviate the need to enter a password at connection time (see
 and
 .Xr ssh-keygen 1
 for details).
+.Pp
+Since some usage formats use colon characters to delimit host names from path
+names, IPv6 addresses must be enclosed in square brackets to avoid ambiguity.
+.Pp
 The options are as follows:
 .Bl -tag -width Ds
 .It Fl 1