summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2014-05-15 13:47:37 +1000
committerDamien Miller <djm@mindrot.org>2014-05-15 13:47:37 +1000
commit798a02568b13a2e46efebd81f08c8f4bb33a6dc7 (patch)
tree1dadf43c691a229424f549cbb84f8e8e9aa1840a
parentd875ff78d2b8436807381051de112f0ebf9b9ae1 (diff)
- jmc@cvs.openbsd.org 2014/04/22 14:16:30
[sftp.1] zap eol whitespace;
-rw-r--r--ChangeLog3
-rw-r--r--sftp.112
2 files changed, 9 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index 6acc22b0..66e03a38 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -19,6 +19,9 @@
[sftp.1]
Document sftp upload resume.
OK from djm@, with feedback from okan@.
+ - jmc@cvs.openbsd.org 2014/04/22 14:16:30
+ [sftp.1]
+ zap eol whitespace;
20140430
- (dtucker) [defines.h] Define __GNUC_PREREQ__ macro if we don't already
diff --git a/sftp.1 b/sftp.1
index e73a480a..7eb9970a 100644
--- a/sftp.1
+++ b/sftp.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: sftp.1,v 1.98 2014/04/22 12:42:04 logan Exp $
+.\" $OpenBSD: sftp.1,v 1.99 2014/04/22 14:16:30 jmc Exp $
.\"
.\" Copyright (c) 2001 Damien Miller. All rights reserved.
.\"
@@ -108,9 +108,9 @@ Forces
.Nm
to use IPv6 addresses only.
.It Fl a
-Attempt to continue interrupted transfers rather than overwriting
+Attempt to continue interrupted transfers rather than overwriting
existing partial or complete copies of files.
-If the partial contents differ from those being transferred,
+If the partial contents differ from those being transferred,
then the resultant file is likely to be corrupt.
.It Fl B Ar buffer_size
Specify the size of the buffer that
@@ -515,10 +515,10 @@ is specified, then
must specify a directory.
.Pp
If the
-.Fl a
+.Fl a
flag is specified, then attempt to resume partial
transfers of existing files.
-Note that resumption assumes that any partial copy of the remote file
+Note that resumption assumes that any partial copy of the remote file
matches the local copy.
If the local file contents differ from the remote local copy then
the resultant file is likely to be corrupt.
@@ -570,7 +570,7 @@ Resume upload of
.Op Ar local-path .
Equivalent to
.Ic put
-with the
+with the
.Fl a
flag set.
.It Ic rename Ar oldpath Ar newpath