summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog3
-rw-r--r--sftp.110
2 files changed, 9 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 99a2d4979..f8596098d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -9,6 +9,9 @@
9 - djm@cvs.openbsd.org 2010/09/11 21:44:20 9 - djm@cvs.openbsd.org 2010/09/11 21:44:20
10 [ssh.1] 10 [ssh.1]
11 mention RFC 5656 for ECC stuff 11 mention RFC 5656 for ECC stuff
12 - jmc@cvs.openbsd.org 2010/09/19 21:30:05
13 [sftp.1]
14 more wacky macro fixing;
12 15
1320100910 1620100910
14 - (dtucker) [openbsd-compat/port-linux.c] Check is_selinux_enabled for exact 17 - (dtucker) [openbsd-compat/port-linux.c] Check is_selinux_enabled for exact
diff --git a/sftp.1 b/sftp.1
index 777b02a58..49d88de03 100644
--- a/sftp.1
+++ b/sftp.1
@@ -1,4 +1,4 @@
1.\" $OpenBSD: sftp.1,v 1.83 2010/02/08 10:50:20 markus Exp $ 1.\" $OpenBSD: sftp.1,v 1.84 2010/09/19 21:30:05 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: February 8 2010 $ 25.Dd $Mdocdate: September 19 2010 $
26.Dt SFTP 1 26.Dt SFTP 1
27.Os 27.Os
28.Sh NAME 28.Sh NAME
@@ -49,9 +49,11 @@
49.Oo Ar user Ns @ Oc Ns 49.Oo Ar user Ns @ Oc Ns
50.Ar host Ns Op : Ns Ar 50.Ar host Ns Op : Ns Ar
51.Nm sftp 51.Nm sftp
52.Oo Ar user Ns @ Oc Ns 52.Oo
53.Ar user Ns @ Oc Ns
53.Ar host Ns Oo : Ns Ar dir Ns 54.Ar host Ns Oo : Ns Ar dir Ns
54.Op Ar / Oc 55.Op Ar /
56.Oc
55.Nm sftp 57.Nm sftp
56.Fl b Ar batchfile 58.Fl b Ar batchfile
57.Oo Ar user Ns @ Oc Ns Ar host 59.Oo Ar user Ns @ Oc Ns Ar host