===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/ssh/sftp.1,v
retrieving revision 1.88.2.1
retrieving revision 1.89
diff -u -r1.88.2.1 -r1.89
--- src/usr.bin/ssh/sftp.1	2011/08/07 12:53:56	1.88.2.1
+++ src/usr.bin/ssh/sftp.1	2011/05/06 01:09:53	1.89
@@ -1,4 +1,4 @@
-.\" $OpenBSD: sftp.1,v 1.88.2.1 2011/08/07 12:53:56 dtucker 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: August 7 2011 $
+.Dd $Mdocdate: May 6 2011 $
 .Dt SFTP 1
 .Os
 .Sh NAME
@@ -89,6 +89,10 @@
 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
@@ -479,7 +483,7 @@
 .Ar remote-path
 must specify a directory.
 .Pp
-If either the
+If ether the
 .Fl P
 or
 .Fl p