1 files changed, 26 insertions, 18 deletions
diff --git a/sftp.1 b/sftp.1
index 259095885..a52c1cff3 100644
--- a/sftp.1
+++ b/sftp.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: sftp.1,v 1.125 2019/01/22 06:58:31 jmc Exp $
+.\" $OpenBSD: sftp.1,v 1.127 2019/06/19 20:12:44 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: January 22 2019 $
+.Dd $Mdocdate: June 19 2019 $
 .Dt SFTP 1
 .Os
 .Sh NAME
@@ -241,7 +241,7 @@ For full details of the options listed below, and their possible values, see
 .It HostbasedKeyTypes
 .It HostKeyAlgorithms
 .It HostKeyAlias
-.It HostName
+.It Hostname
 .It IdentitiesOnly
 .It IdentityAgent
 .It IdentityFile
@@ -404,7 +404,7 @@ extension.
 Quit
 .Nm sftp .
 .It Xo Ic get
-.Op Fl afPpr
+.Op Fl afpR
 .Ar remote-path
 .Op Ar local-path
 .Xc
@@ -439,15 +439,19 @@ flag is specified, then
 will be called after the file transfer has completed to flush the file
 to disk.
 .Pp
-If either the
+If the
-.Fl P
-or
 .Fl p
+.\" undocumented redundant alias
+.\" or
+.\" .Fl P
 flag is specified, then full file permissions and access times are
 copied too.
 .Pp
 If the
-.Fl r
+.Fl R
+.\" undocumented redundant alias
+.\" or
+.\" .Fl r
 flag is specified then directories will be copied recursively.
 Note that
 .Nm
@@ -545,7 +549,7 @@ Create remote directory specified by
 .It Ic progress
 Toggle display of progress meter.
 .It Xo Ic put
-.Op Fl afPpr
+.Op Fl afpR
 .Ar local-path
 .Op Ar remote-path
 .Xc
@@ -581,15 +585,19 @@ after the file has been transferred.
 Note that this is only supported by servers that implement
 the "fsync@openssh.com" extension.
 .Pp
-If either the
+If the
-.Fl P
-or
 .Fl p
+.\" undocumented redundant alias
+.\" or
+.\" .Fl P
 flag is specified, then full file permissions and access times are
 copied too.
 .Pp
 If the
-.Fl r
+.Fl R
+.\" undocumented redundant alias
+.\" or
+.\" .Fl r
 flag is specified then directories will be copied recursively.
 Note that
 .Nm
@@ -600,7 +608,7 @@ Display remote working directory.
 Quit
 .Nm sftp .
 .It Xo Ic reget
-.Op Fl Ppr
+.Op Fl fpR
 .Ar remote-path
 .Op Ar local-path
 .Xc
@@ -612,12 +620,12 @@ with the
 .Fl a
 flag set.
 .It Xo Ic reput
-.Op Fl Ppr
+.Op Fl fpR
-.Op Ar local-path
+.Ar local-path
-.Ar remote-path
+.Op Ar remote-path
 .Xc
 Resume upload of
-.Op Ar local-path .
+.Ar local-path .
 Equivalent to
 .Ic put
 with the

diff --git a/sftp.1 b/sftp.1 index 259095885..a52c1cff3 100644 --- a/sftp.1 +++ b/sftp.1
@@ -1,4 +1,4 @@
1	.\" $OpenBSD: sftp.1,v 1.125 2019/01/22 06:58:31 jmc Exp $	1	.\" $OpenBSD: sftp.1,v 1.127 2019/06/19 20:12:44 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: January 22 2019 $	25	.Dd $Mdocdate: June 19 2019 $
26	.Dt SFTP 1	26	.Dt SFTP 1
27	.Os	27	.Os
28	.Sh NAME	28	.Sh NAME
@@ -241,7 +241,7 @@ For full details of the options listed below, and their possible values, see
241	.It HostbasedKeyTypes	241	.It HostbasedKeyTypes
242	.It HostKeyAlgorithms	242	.It HostKeyAlgorithms
243	.It HostKeyAlias	243	.It HostKeyAlias
244	.It HostName	244	.It Hostname
245	.It IdentitiesOnly	245	.It IdentitiesOnly
246	.It IdentityAgent	246	.It IdentityAgent
247	.It IdentityFile	247	.It IdentityFile
@@ -404,7 +404,7 @@ extension.
404	Quit	404	Quit
405	.Nm sftp .	405	.Nm sftp .
406	.It Xo Ic get	406	.It Xo Ic get
407	.Op Fl afPpr	407	.Op Fl afpR
408	.Ar remote-path	408	.Ar remote-path
409	.Op Ar local-path	409	.Op Ar local-path
410	.Xc	410	.Xc
@@ -439,15 +439,19 @@ flag is specified, then
439	will be called after the file transfer has completed to flush the file	439	will be called after the file transfer has completed to flush the file
440	to disk.	440	to disk.
441	.Pp	441	.Pp
442	If either the	442	If the
443	.Fl P
444	or
445	.Fl p	443	.Fl p
		444	.\" undocumented redundant alias
		445	.\" or
		446	.\" .Fl P
446	flag is specified, then full file permissions and access times are	447	flag is specified, then full file permissions and access times are
447	copied too.	448	copied too.
448	.Pp	449	.Pp
449	If the	450	If the
450	.Fl r	451	.Fl R
		452	.\" undocumented redundant alias
		453	.\" or
		454	.\" .Fl r
451	flag is specified then directories will be copied recursively.	455	flag is specified then directories will be copied recursively.
452	Note that	456	Note that
453	.Nm	457	.Nm
@@ -545,7 +549,7 @@ Create remote directory specified by
545	.It Ic progress	549	.It Ic progress
546	Toggle display of progress meter.	550	Toggle display of progress meter.
547	.It Xo Ic put	551	.It Xo Ic put
548	.Op Fl afPpr	552	.Op Fl afpR
549	.Ar local-path	553	.Ar local-path
550	.Op Ar remote-path	554	.Op Ar remote-path
551	.Xc	555	.Xc
@@ -581,15 +585,19 @@ after the file has been transferred.
581	Note that this is only supported by servers that implement	585	Note that this is only supported by servers that implement
582	the "fsync@openssh.com" extension.	586	the "fsync@openssh.com" extension.
583	.Pp	587	.Pp
584	If either the	588	If the
585	.Fl P
586	or
587	.Fl p	589	.Fl p
		590	.\" undocumented redundant alias
		591	.\" or
		592	.\" .Fl P
588	flag is specified, then full file permissions and access times are	593	flag is specified, then full file permissions and access times are
589	copied too.	594	copied too.
590	.Pp	595	.Pp
591	If the	596	If the
592	.Fl r	597	.Fl R
		598	.\" undocumented redundant alias
		599	.\" or
		600	.\" .Fl r
593	flag is specified then directories will be copied recursively.	601	flag is specified then directories will be copied recursively.
594	Note that	602	Note that
595	.Nm	603	.Nm
@@ -600,7 +608,7 @@ Display remote working directory.
600	Quit	608	Quit
601	.Nm sftp .	609	.Nm sftp .
602	.It Xo Ic reget	610	.It Xo Ic reget
603	.Op Fl Ppr	611	.Op Fl fpR
604	.Ar remote-path	612	.Ar remote-path
605	.Op Ar local-path	613	.Op Ar local-path
606	.Xc	614	.Xc
@@ -612,12 +620,12 @@ with the
612	.Fl a	620	.Fl a
613	flag set.	621	flag set.
614	.It Xo Ic reput	622	.It Xo Ic reput
615	.Op Fl Ppr	623	.Op Fl fpR
616	.Op Ar local-path	624	.Ar local-path
617	.Ar remote-path	625	.Op Ar remote-path
618	.Xc	626	.Xc
619	Resume upload of	627	Resume upload of
620	.Op Ar local-path .	628	.Ar local-path .
621	Equivalent to	629	Equivalent to
622	.Ic put	630	.Ic put
623	with the	631	with the