1 files changed, 5 insertions, 15 deletions
diff --git a/sftp.1 b/sftp.1
index fbdd00a1e..c218376fb 100644
--- a/sftp.1
+++ b/sftp.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: sftp.1,v 1.105 2016/07/16 06:57:55 jmc Exp $
+.\" $OpenBSD: sftp.1,v 1.110 2017/05/03 21:49:18 naddy 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: July 16 2016 $
+.Dd $Mdocdate: May 3 2017 $
 .Dt SFTP 1
 .Os
 .Sh NAME
@@ -31,7 +31,7 @@
 .Sh SYNOPSIS
 .Nm sftp
 .Bk -words
-.Op Fl 1246aCfpqrv
+.Op Fl 46aCfpqrv
 .Op Fl B Ar buffer_size
 .Op Fl b Ar batchfile
 .Op Fl c Ar cipher
@@ -95,10 +95,6 @@ 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
-Specify the use of protocol version 1.
-.It Fl 2
-Specify the use of protocol version 2.
 .It Fl 4
 Forces
 .Nm
@@ -201,10 +197,8 @@ For full details of the options listed below, and their possible values, see
 .It CertificateFile
 .It ChallengeResponseAuthentication
 .It CheckHostIP
-.It Cipher
 .It Ciphers
 .It Compression
-.It CompressionLevel
 .It ConnectionAttempts
 .It ConnectTimeout
 .It ControlMaster
@@ -235,13 +229,11 @@ For full details of the options listed below, and their possible values, see
 .It PKCS11Provider
 .It Port
 .It PreferredAuthentications
-.It Protocol
 .It ProxyCommand
 .It ProxyJump
+.It PubkeyAcceptedKeyTypes
 .It PubkeyAuthentication
 .It RekeyLimit
-.It RhostsRSAAuthentication
-.It RSAAuthentication
 .It SendEnv
 .It ServerAliveInterval
 .It ServerAliveCountMax
@@ -282,9 +274,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

diff --git a/sftp.1 b/sftp.1 index fbdd00a1e..c218376fb 100644 --- a/sftp.1 +++ b/sftp.1
@@ -1,4 +1,4 @@
1	.\" $OpenBSD: sftp.1,v 1.105 2016/07/16 06:57:55 jmc Exp $	1	.\" $OpenBSD: sftp.1,v 1.110 2017/05/03 21:49:18 naddy 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: July 16 2016 $	25	.Dd $Mdocdate: May 3 2017 $
26	.Dt SFTP 1	26	.Dt SFTP 1
27	.Os	27	.Os
28	.Sh NAME	28	.Sh NAME
@@ -31,7 +31,7 @@
31	.Sh SYNOPSIS	31	.Sh SYNOPSIS
32	.Nm sftp	32	.Nm sftp
33	.Bk -words	33	.Bk -words
34	.Op Fl 1246aCfpqrv	34	.Op Fl 46aCfpqrv
35	.Op Fl B Ar buffer_size	35	.Op Fl B Ar buffer_size
36	.Op Fl b Ar batchfile	36	.Op Fl b Ar batchfile
37	.Op Fl c Ar cipher	37	.Op Fl c Ar cipher
@@ -95,10 +95,6 @@ names, IPv6 addresses must be enclosed in square brackets to avoid ambiguity.
95	.Pp	95	.Pp
96	The options are as follows:	96	The options are as follows:
97	.Bl -tag -width Ds	97	.Bl -tag -width Ds
98	.It Fl 1
99	Specify the use of protocol version 1.
100	.It Fl 2
101	Specify the use of protocol version 2.
102	.It Fl 4	98	.It Fl 4
103	Forces	99	Forces
104	.Nm	100	.Nm
@@ -201,10 +197,8 @@ For full details of the options listed below, and their possible values, see
201	.It CertificateFile	197	.It CertificateFile
202	.It ChallengeResponseAuthentication	198	.It ChallengeResponseAuthentication
203	.It CheckHostIP	199	.It CheckHostIP
204	.It Cipher
205	.It Ciphers	200	.It Ciphers
206	.It Compression	201	.It Compression
207	.It CompressionLevel
208	.It ConnectionAttempts	202	.It ConnectionAttempts
209	.It ConnectTimeout	203	.It ConnectTimeout
210	.It ControlMaster	204	.It ControlMaster
@@ -235,13 +229,11 @@ For full details of the options listed below, and their possible values, see
235	.It PKCS11Provider	229	.It PKCS11Provider
236	.It Port	230	.It Port
237	.It PreferredAuthentications	231	.It PreferredAuthentications
238	.It Protocol
239	.It ProxyCommand	232	.It ProxyCommand
240	.It ProxyJump	233	.It ProxyJump
		234	.It PubkeyAcceptedKeyTypes
241	.It PubkeyAuthentication	235	.It PubkeyAuthentication
242	.It RekeyLimit	236	.It RekeyLimit
243	.It RhostsRSAAuthentication
244	.It RSAAuthentication
245	.It SendEnv	237	.It SendEnv
246	.It ServerAliveInterval	238	.It ServerAliveInterval
247	.It ServerAliveCountMax	239	.It ServerAliveCountMax
@@ -282,9 +274,7 @@ options.
282	.It Fl s Ar subsystem \| sftp_server	274	.It Fl s Ar subsystem \| sftp_server
283	Specifies the SSH2 subsystem or the path for an sftp server	275	Specifies the SSH2 subsystem or the path for an sftp server
284	on the remote host.	276	on the remote host.
285	A path is useful for using	277	A path is useful when the remote
286	.Nm
287	over protocol version 1, or when the remote
288	.Xr sshd 8	278	.Xr sshd 8
289	does not have an sftp subsystem configured.	279	does not have an sftp subsystem configured.
290	.It Fl v	280	.It Fl v