summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--sftp.17
2 files changed, 8 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index eba49fee6..c87b05453 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -30,6 +30,9 @@
30 statvfs@openssh.com to produce a df(1)-like display of filesystem 30 statvfs@openssh.com to produce a df(1)-like display of filesystem
31 space and inode utilisation 31 space and inode utilisation
32 ok markus@ 32 ok markus@
33 - jmc@cvs.openbsd.org 2008/04/18 17:15:47
34 [sftp.1]
35 macro fixage;
33 36
3420080403 3720080403
35 - (djm) [openbsd-compat/bsd-poll.c] Include stdlib.h to avoid compile- 38 - (djm) [openbsd-compat/bsd-poll.c] Include stdlib.h to avoid compile-
@@ -3890,4 +3893,4 @@
3890 OpenServer 6 and add osr5bigcrypt support so when someone migrates 3893 OpenServer 6 and add osr5bigcrypt support so when someone migrates
3891 passwords between UnixWare and OpenServer they will still work. OK dtucker@ 3894 passwords between UnixWare and OpenServer they will still work. OK dtucker@
3892 3895
3893$Id: ChangeLog,v 1.4911 2008/05/19 04:53:33 djm Exp $ 3896$Id: ChangeLog,v 1.4912 2008/05/19 04:54:25 djm Exp $
diff --git a/sftp.1 b/sftp.1
index f34f58856..72c93b7f5 100644
--- a/sftp.1
+++ b/sftp.1
@@ -1,4 +1,4 @@
1.\" $OpenBSD: sftp.1,v 1.65 2008/04/18 12:32:11 djm Exp $ 1.\" $OpenBSD: sftp.1,v 1.66 2008/04/18 17:15:47 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: April 18 2008 $ 25.Dd $Mdocdate: May 19 2008 $
26.Dt SFTP 1 26.Dt SFTP 1
27.Os 27.Os
28.Sh NAME 28.Sh NAME
@@ -112,7 +112,8 @@ will abort if any of the following
112commands fail: 112commands fail:
113.Ic get , put , rename , ln , 113.Ic get , put , rename , ln ,
114.Ic rm , mkdir , chdir , ls , 114.Ic rm , mkdir , chdir , ls ,
115.Ic lchdir , chmod , chown , chgrp , lpwd, df, 115.Ic lchdir , chmod , chown ,
116.Ic chgrp , lpwd , df ,
116and 117and
117.Ic lmkdir . 118.Ic lmkdir .
118Termination on error can be suppressed on a command by command basis by 119Termination on error can be suppressed on a command by command basis by