From 58a77e2eac23f22708002e00a57af1b9cbec282f Mon Sep 17 00:00:00 2001
From: Damien Miller <djm@mindrot.org>
Date: Sun, 15 May 2011 08:36:29 +1000
Subject:    - djm@cvs.openbsd.org 2011/05/06 01:09:53      [sftp.1]     
 mention that IPv6 addresses must be enclosed in square brackets;      bz#1845

---
 sftp.1 | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'sftp.1')

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
-- 
cgit v1.2.3


From ddccfb4b985ec765c605fb4eb1e6b54ad9321020 Mon Sep 17 00:00:00 2001
From: Darren Tucker <dtucker@zip.com.au>
Date: Sun, 7 Aug 2011 23:12:26 +1000
Subject:    - dtucker@cvs.openbsd.org 2011/08/07 12:55:30      [sftp.1]     
 typo, fix from Laurent Gautrot

---
 ChangeLog | 3 +++
 sftp.1    | 6 +++---
 2 files changed, 6 insertions(+), 3 deletions(-)

(limited to 'sftp.1')

diff --git a/ChangeLog b/ChangeLog
index 984179d29..b83290c2f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -11,6 +11,9 @@
    - jmc@cvs.openbsd.org 2010/10/14 20:41:28
      [moduli.5]
      probabalistic -> probabilistic; from naddy
+   - dtucker@cvs.openbsd.org 2011/08/07 12:55:30
+     [sftp.1]
+     typo, fix from Laurent Gautrot
 
 20110805
  - OpenBSD CVS Sync
diff --git a/sftp.1 b/sftp.1
index 3b6ee3890..eb88014e2 100644
--- a/sftp.1
+++ b/sftp.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: sftp.1,v 1.89 2011/05/06 01:09:53 djm Exp $
+.\" $OpenBSD: sftp.1,v 1.90 2011/08/07 12:55:30 dtucker 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: May 6 2011 $
+.Dd $Mdocdate: August 7 2011 $
 .Dt SFTP 1
 .Os
 .Sh NAME
@@ -483,7 +483,7 @@ is specified, then
 .Ar remote-path
 must specify a directory.
 .Pp
-If ether the
+If either the
 .Fl P
 or
 .Fl p
-- 
cgit v1.2.3