upstream commit

more protocol 1 stuff to go; ok djm Upstream-ID: 307a30441d2edda480fd1661d998d36665671e47
author: jmc@openbsd.org <jmc@openbsd.org> 2017-05-03 06:32:02 +0000
committer: Damien Miller <djm@mindrot.org> 2017-05-08 09:18:05 +1000
commit: 2b6f799e9b230cf13a7eefc05ecead7d8569d6b5 (patch)
tree: c0abc7946a2e79b528d4e2e8b59520b686d6c4ac /sftp.1
parent: f10c0d32cde2084d2a0b19bc47d80cb93e85a093 (diff)
1 files changed, 3 insertions, 5 deletions
diff --git a/sftp.1 b/sftp.1
index fc5e00503..5dce807f6 100644
--- a/sftp.1
+++ b/sftp.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: sftp.1,v 1.108 2017/05/02 14:06:37 jmc Exp $
+.\" $OpenBSD: sftp.1,v 1.109 2017/05/03 06:32:02 jmc 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 2 2017 $
+.Dd $Mdocdate: May 3 2017 $
 .Dt SFTP 1
 .Os
 .Sh NAME
@@ -273,9 +273,7 @@ options.
 .It Fl s Ar subsystem | sftp_server
 Specifies the SSH2 subsystem or the path for an sftp server
 on the remote host.
-A path is useful for using
+A path is useful when the remote
-.Nm
-over protocol version 1, or when the remote
 .Xr sshd 8
 does not have an sftp subsystem configured.
 .It Fl v
author	jmc@openbsd.org <jmc@openbsd.org>	2017-05-03 06:32:02 +0000
committer	Damien Miller <djm@mindrot.org>	2017-05-08 09:18:05 +1000
commit	2b6f799e9b230cf13a7eefc05ecead7d8569d6b5 (patch)
tree	c0abc7946a2e79b528d4e2e8b59520b686d6c4ac /sftp.1
parent	f10c0d32cde2084d2a0b19bc47d80cb93e85a093 (diff)

diff --git a/sftp.1 b/sftp.1 index fc5e00503..5dce807f6 100644 --- a/sftp.1 +++ b/sftp.1
@@ -1,4 +1,4 @@
1	.\" $OpenBSD: sftp.1,v 1.108 2017/05/02 14:06:37 jmc Exp $	1	.\" $OpenBSD: sftp.1,v 1.109 2017/05/03 06:32:02 jmc 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: May 2 2017 $	25	.Dd $Mdocdate: May 3 2017 $
26	.Dt SFTP 1	26	.Dt SFTP 1
27	.Os	27	.Os
28	.Sh NAME	28	.Sh NAME
@@ -273,9 +273,7 @@ options.
273	.It Fl s Ar subsystem \| sftp_server	273	.It Fl s Ar subsystem \| sftp_server
274	Specifies the SSH2 subsystem or the path for an sftp server	274	Specifies the SSH2 subsystem or the path for an sftp server
275	on the remote host.	275	on the remote host.
276	A path is useful for using	276	A path is useful when the remote
277	.Nm
278	over protocol version 1, or when the remote
279	.Xr sshd 8	277	.Xr sshd 8
280	does not have an sftp subsystem configured.	278	does not have an sftp subsystem configured.
281	.It Fl v	279	.It Fl v