summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2004-01-21 11:00:04 +1100
committerDamien Miller <djm@mindrot.org>2004-01-21 11:00:04 +1100
commit86a396857d4021a5f17c018654e2b7759c84dd04 (patch)
treeab2a31ce90c3d8af3664b0d80e670eec9837f3e6
parent44f75c14f6f1eacfe6e1c98eae742019de24ad6a (diff)
- jmc@cvs.openbsd.org 2004/01/13 12:17:33
[sftp.1] remove unnecessary Ic's; kill whitespace at EOL; ok djm@
-rw-r--r--ChangeLog7
-rw-r--r--sftp.112
2 files changed, 12 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog
index 9985b57ff..2c6dc85e3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,11 @@
4 [sftp-int.c sftp.1 sftp.c] 4 [sftp-int.c sftp.1 sftp.c]
5 Tidy sftp batchmode handling, eliminate junk to stderr (bugzilla #754) and 5 Tidy sftp batchmode handling, eliminate junk to stderr (bugzilla #754) and
6 enable use of "-b -" to accept batchfile from stdin; ok markus@ 6 enable use of "-b -" to accept batchfile from stdin; ok markus@
7 - jmc@cvs.openbsd.org 2004/01/13 12:17:33
8 [sftp.1]
9 remove unnecessary Ic's;
10 kill whitespace at EOL;
11 ok djm@
7 12
820040114 1320040114
9 - (dtucker) [auth-pam.c] Have monitor die if PAM authentication thread exits 14 - (dtucker) [auth-pam.c] Have monitor die if PAM authentication thread exits
@@ -1673,4 +1678,4 @@
1673 - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo. 1678 - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo.
1674 Report from murple@murple.net, diagnosis from dtucker@zip.com.au 1679 Report from murple@murple.net, diagnosis from dtucker@zip.com.au
1675 1680
1676$Id: ChangeLog,v 1.3170 2004/01/20 23:58:47 djm Exp $ 1681$Id: ChangeLog,v 1.3171 2004/01/21 00:00:04 djm Exp $
diff --git a/sftp.1 b/sftp.1
index cfa2e10b3..2a67a888e 100644
--- a/sftp.1
+++ b/sftp.1
@@ -1,4 +1,4 @@
1.\" $OpenBSD: sftp.1,v 1.50 2004/01/13 09:25:05 djm Exp $ 1.\" $OpenBSD: sftp.1,v 1.51 2004/01/13 12:17:33 jmc Exp $
2.\" 2.\"
3.\" Copyright (c) 2001 Damien Miller. All rights reserved. 3.\" Copyright (c) 2001 Damien Miller. All rights reserved.
4.\" 4.\"
@@ -99,11 +99,11 @@ Batch mode reads a series of commands from an input
99instead of 99instead of
100.Em stdin . 100.Em stdin .
101Since it lacks user interaction it should be used in conjunction with 101Since it lacks user interaction it should be used in conjunction with
102non-interactive authentication. 102non-interactive authentication.
103A 103A
104.Ar batchfile 104.Ar batchfile
105of 105of
106.Sq Ic \- 106.Sq \-
107may be used to indicate standard input. 107may be used to indicate standard input.
108.Nm 108.Nm
109will abort if any of the following 109will abort if any of the following
@@ -115,7 +115,7 @@ and
115.Ic lmkdir . 115.Ic lmkdir .
116Termination on error can be suppressed on a command by command basis by 116Termination on error can be suppressed on a command by command basis by
117prefixing the command with a 117prefixing the command with a
118.Sq Ic \- 118.Sq \-
119character (for example, 119character (for example,
120.Ic -rm /tmp/blah* ) . 120.Ic -rm /tmp/blah* ) .
121.It Fl C 121.It Fl C