summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2011-05-15 08:36:29 +1000
committerDamien Miller <djm@mindrot.org>2011-05-15 08:36:29 +1000
commit58a77e2eac23f22708002e00a57af1b9cbec282f (patch)
treea60de560160239d1be2c30a149a09d3fb38faeb9
parentfd53abd00bf1708c401f3de3d62e9d8ca635e4d3 (diff)
- djm@cvs.openbsd.org 2011/05/06 01:09:53
[sftp.1] mention that IPv6 addresses must be enclosed in square brackets; bz#1845
-rw-r--r--ChangeLog4
-rw-r--r--sftp.18
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 @@
7 - dtucker@cvs.openbsd.org 2011/05/06 01:03:35 7 - dtucker@cvs.openbsd.org 2011/05/06 01:03:35
8 [sshd_config] 8 [sshd_config]
9 clarify language about overriding defaults. bz#1892, from Petr Cerny 9 clarify language about overriding defaults. bz#1892, from Petr Cerny
10 - djm@cvs.openbsd.org 2011/05/06 01:09:53
11 [sftp.1]
12 mention that IPv6 addresses must be enclosed in square brackets;
13 bz#1845
10 14
1120110510 1520110510
12 - (dtucker) [openbsd-compat/openssl-compat.{c,h}] Bug #1882: fix 16 - (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 @@
1.\" $OpenBSD: sftp.1,v 1.88 2010/12/04 00:18:01 djm Exp $ 1.\" $OpenBSD: sftp.1,v 1.89 2011/05/06 01:09:53 djm Exp $
2.\" 2.\"
3.\" Copyright (c) 2001 Damien Miller. All rights reserved. 3.\" Copyright (c) 2001 Damien Miller. All rights reserved.
4.\" 4.\"
@@ -22,7 +22,7 @@
22.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF 22.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
23.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 23.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
24.\" 24.\"
25.Dd $Mdocdate: December 4 2010 $ 25.Dd $Mdocdate: May 6 2011 $
26.Dt SFTP 1 26.Dt SFTP 1
27.Os 27.Os
28.Sh NAME 28.Sh NAME
@@ -89,6 +89,10 @@ to obviate the need to enter a password at connection time (see
89and 89and
90.Xr ssh-keygen 1 90.Xr ssh-keygen 1
91for details). 91for details).
92.Pp
93Since some usage formats use colon characters to delimit host names from path
94names, IPv6 addresses must be enclosed in square brackets to avoid ambiguity.
95.Pp
92The options are as follows: 96The options are as follows:
93.Bl -tag -width Ds 97.Bl -tag -width Ds
94.It Fl 1 98.It Fl 1