summaryrefslogtreecommitdiff
path: root/sftp.1
diff options
context:
space:
mode:
authorColin Watson <cjwatson@debian.org>2011-09-06 09:45:52 +0100
committerColin Watson <cjwatson@debian.org>2011-09-06 09:45:52 +0100
commitf38224d546cdde55f45c13d3d8225d273a3f920e (patch)
treea91a26b88ac90dc72d0ea3767feabb341eaa50a8 /sftp.1
parent338146a3fc257e216fe5c10fe40e6896b40d7739 (diff)
parente90790abaf031e037f444a6658e136e48577ea49 (diff)
merge 5.9p1
Diffstat (limited to 'sftp.1')
-rw-r--r--sftp.110
1 files changed, 7 insertions, 3 deletions
diff --git a/sftp.1 b/sftp.1
index 89b5d3544..eb88014e2 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.90 2011/08/07 12:55:30 dtucker 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: August 7 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
@@ -479,7 +483,7 @@ is specified, then
479.Ar remote-path 483.Ar remote-path
480must specify a directory. 484must specify a directory.
481.Pp 485.Pp
482If ether the 486If either the
483.Fl P 487.Fl P
484or 488or
485.Fl p 489.Fl p