diff options
-rw-r--r-- | ChangeLog | 3 | ||||
-rw-r--r-- | sftp.1 | 12 |
2 files changed, 9 insertions, 6 deletions
@@ -19,6 +19,9 @@ | |||
19 | [sftp.1] | 19 | [sftp.1] |
20 | Document sftp upload resume. | 20 | Document sftp upload resume. |
21 | OK from djm@, with feedback from okan@. | 21 | OK from djm@, with feedback from okan@. |
22 | - jmc@cvs.openbsd.org 2014/04/22 14:16:30 | ||
23 | [sftp.1] | ||
24 | zap eol whitespace; | ||
22 | 25 | ||
23 | 20140430 | 26 | 20140430 |
24 | - (dtucker) [defines.h] Define __GNUC_PREREQ__ macro if we don't already | 27 | - (dtucker) [defines.h] Define __GNUC_PREREQ__ macro if we don't already |
@@ -1,4 +1,4 @@ | |||
1 | .\" $OpenBSD: sftp.1,v 1.98 2014/04/22 12:42:04 logan Exp $ | 1 | .\" $OpenBSD: sftp.1,v 1.99 2014/04/22 14:16:30 jmc Exp $ |
2 | .\" | 2 | .\" |
3 | .\" Copyright (c) 2001 Damien Miller. All rights reserved. | 3 | .\" Copyright (c) 2001 Damien Miller. All rights reserved. |
4 | .\" | 4 | .\" |
@@ -108,9 +108,9 @@ Forces | |||
108 | .Nm | 108 | .Nm |
109 | to use IPv6 addresses only. | 109 | to use IPv6 addresses only. |
110 | .It Fl a | 110 | .It Fl a |
111 | Attempt to continue interrupted transfers rather than overwriting | 111 | Attempt to continue interrupted transfers rather than overwriting |
112 | existing partial or complete copies of files. | 112 | existing partial or complete copies of files. |
113 | If the partial contents differ from those being transferred, | 113 | If the partial contents differ from those being transferred, |
114 | then the resultant file is likely to be corrupt. | 114 | then the resultant file is likely to be corrupt. |
115 | .It Fl B Ar buffer_size | 115 | .It Fl B Ar buffer_size |
116 | Specify the size of the buffer that | 116 | Specify the size of the buffer that |
@@ -515,10 +515,10 @@ is specified, then | |||
515 | must specify a directory. | 515 | must specify a directory. |
516 | .Pp | 516 | .Pp |
517 | If the | 517 | If the |
518 | .Fl a | 518 | .Fl a |
519 | flag is specified, then attempt to resume partial | 519 | flag is specified, then attempt to resume partial |
520 | transfers of existing files. | 520 | transfers of existing files. |
521 | Note that resumption assumes that any partial copy of the remote file | 521 | Note that resumption assumes that any partial copy of the remote file |
522 | matches the local copy. | 522 | matches the local copy. |
523 | If the local file contents differ from the remote local copy then | 523 | If the local file contents differ from the remote local copy then |
524 | the resultant file is likely to be corrupt. | 524 | the resultant file is likely to be corrupt. |
@@ -570,7 +570,7 @@ Resume upload of | |||
570 | .Op Ar local-path . | 570 | .Op Ar local-path . |
571 | Equivalent to | 571 | Equivalent to |
572 | .Ic put | 572 | .Ic put |
573 | with the | 573 | with the |
574 | .Fl a | 574 | .Fl a |
575 | flag set. | 575 | flag set. |
576 | .It Ic rename Ar oldpath Ar newpath | 576 | .It Ic rename Ar oldpath Ar newpath |