3 files changed, 14 insertions, 11 deletions

diff --git a/ChangeLog b/ChangeLog
index ab50a006a..93e72b3cd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -18,6 +18,10 @@
      failure; avoids double-free in ~C -L handler when given an invalid
      forwarding specification; bz#1539 report from adejong AT debian.org
      via Colin Watson; ok markus@ dtucker@
+   - djm@cvs.openbsd.org 2008/12/09 03:02:37
+     [sftp.1 sftp.c]
+     correct sftp(1) and corresponding usage syntax;
+     bz#1518 patch from imorgan AT nas.nasa.gov; ok deraadt@ improved diff jmc@
 
 20081208
  - (djm) [configure.ac] bz#1538: better test for ProPolice/SSP: actually
@@ -4985,5 +4989,5 @@
    OpenServer 6 and add osr5bigcrypt support so when someone migrates
    passwords between UnixWare and OpenServer they will still work. OK dtucker@
 
-$Id: ChangeLog,v 1.5154 2008/12/09 03:12:05 djm Exp $
+$Id: ChangeLog,v 1.5155 2008/12/09 03:12:33 djm Exp $
 
diff --git a/sftp.1 b/sftp.1
index b4f9a6884..c44564a29 100644
--- a/sftp.1
+++ b/sftp.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: sftp.1,v 1.67 2008/07/15 02:23:14 djm Exp $
+.\" $OpenBSD: sftp.1,v 1.68 2008/12/09 03:02:37 djm Exp $
 .\"
 .\" Copyright (c) 2001 Damien Miller.  All rights reserved.
 .\"
@@ -22,7 +22,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: July 15 2008 $
+.Dd $Mdocdate: December 9 2008 $
 .Dt SFTP 1
 .Os
 .Sh NAME
@@ -43,13 +43,12 @@
 .Ar host
 .Ek
 .Nm sftp
-.Oo Oo Ar user Ns @ Oc Ns
-.Ar host Ns Oo : Ns Ar file Oo
-.Ar file Oc Oc Oc
+.Oo Ar user Ns @ Oc Ns
+.Ar host Ns Op : Ns Ar
 .Nm sftp
-.Oo Oo Ar user Ns @ Oc Ns
+.Oo Ar user Ns @ Oc Ns
 .Ar host Ns Oo : Ns Ar dir Ns
-.Oo Ar / Oc Oc Oc
+.Oo Ar / Oc Oc
 .Nm sftp
 .Fl b Ar batchfile
 .Oo Ar user Ns @ Oc Ns Ar host
diff --git a/sftp.c b/sftp.c
index 4e3c833f7..4d37f8569 100644
--- a/sftp.c
+++ b/sftp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sftp.c,v 1.104 2008/12/09 02:39:59 djm Exp $ */
+/* $OpenBSD: sftp.c,v 1.105 2008/12/09 03:04:39 djm Exp $ */
 /*
  * Copyright (c) 2001-2004 Damien Miller <djm@openbsd.org>
  *
@@ -1670,8 +1670,8 @@ usage(void)
             "usage: %s [-1Cv] [-B buffer_size] [-b batchfile] [-F ssh_config]\n"
             "            [-o ssh_option] [-P sftp_server_path] [-R num_requests]\n"
             "            [-S program] [-s subsystem | sftp_server] host\n"
-            "       %s [[user@]host[:file [file]]]\n"
-            "       %s [[user@]host[:dir[/]]]\n"
+            "       %s [user@]host[:file ...]\n"
+            "       %s [user@]host[:dir[/]]\n"
             "       %s -b batchfile [user@]host\n", __progname, __progname, __progname, __progname);
         exit(1);
 }