summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJason McIntyre <jmc@cvs.openbsd.org>2009-08-13 13:39:55 +0000
committerJason McIntyre <jmc@cvs.openbsd.org>2009-08-13 13:39:55 +0000
commit629efe026cb80764f620bf4e2253c0ca759cb290 (patch)
treecd30e1ef1e13263c2ec98c22b4da260ce2acf4f2
parente8cfd3a0106e99f6e0e37e2306725af7d57c1687 (diff)
sync synopsis and usage();
-rw-r--r--usr.bin/ssh/sftp.14
-rw-r--r--usr.bin/ssh/sftp.c8
2 files changed, 7 insertions, 5 deletions
diff --git a/usr.bin/ssh/sftp.1 b/usr.bin/ssh/sftp.1
index 6cec52ae1c4..fcd1d240a98 100644
--- a/usr.bin/ssh/sftp.1
+++ b/usr.bin/ssh/sftp.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: sftp.1,v 1.72 2009/08/13 01:11:19 djm Exp $
+.\" $OpenBSD: sftp.1,v 1.73 2009/08/13 13:39:54 jmc Exp $
.\"
.\" Copyright (c) 2001 Damien Miller. All rights reserved.
.\"
@@ -37,7 +37,7 @@
.Op Fl c Ar cipher
.Op Fl D Ar sftp_server_path
.Op Fl F Ar ssh_config
-.Op Fl i Ar identity_path
+.Op Fl i Ar identity_file
.Op Fl o Ar ssh_option
.Op Fl P Ar port
.Op Fl R Ar num_requests
diff --git a/usr.bin/ssh/sftp.c b/usr.bin/ssh/sftp.c
index 904c4e6b6ea..61bad00f409 100644
--- a/usr.bin/ssh/sftp.c
+++ b/usr.bin/ssh/sftp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sftp.c,v 1.109 2009/08/13 01:11:19 djm Exp $ */
+/* $OpenBSD: sftp.c,v 1.110 2009/08/13 13:39:54 jmc Exp $ */
/*
* Copyright (c) 2001-2004 Damien Miller <djm@openbsd.org>
*
@@ -1623,8 +1623,10 @@ usage(void)
fprintf(stderr,
"usage: %s [-1246Cqv] [-B buffer_size] [-b batchfile] [-c cipher]\n"
- " [-F ssh_config] [-i identify_file] [-o ssh_option]\n"
- " [-P sftp_server_path] [-R num_requests] [-S program]\n"
+ " [-D sftp_server_path] [-F ssh_config] "
+ "[-i identity_file]\n"
+ " [-o ssh_option] [-P port] [-R num_requests] "
+ "[-S program]\n"
" [-s subsystem | sftp_server] host\n"
" %s [user@]host[:file ...]\n"
" %s [user@]host[:dir[/]]\n"