3 files changed, 12 insertions, 6 deletions

diff --git a/ChangeLog b/ChangeLog
index 3c5bfb042..c4a7d1261 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,12 @@
      [key.c]
      Delint: remove some unreachable statements, from Bret Lambert.
      OK markus@ and dtucker@.
+   - sobrado@cvs.openbsd.org 2007/08/06 19:16:06
+     [scp.1 scp.c]
+     the ellipsis is not an optional argument; while here, sync the usage
+     and synopsis of commands
+     lots of good ideas by jmc@
+     ok jmc@
 
 20070724
  - (tim) [openssh.xml.in] make FMRI match what package scripts use.
@@ -3123,4 +3129,4 @@
    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.4716 2007/08/08 04:28:26 djm Exp $
+$Id: ChangeLog,v 1.4717 2007/08/08 04:29:58 djm Exp $
diff --git a/scp.1 b/scp.1
index 17140e37a..9b221762b 100644
--- a/scp.1
+++ b/scp.1
@@ -9,9 +9,9 @@
 .\"
 .\" Created: Sun May  7 00:14:37 1995 ylo
 .\"
-.\" $OpenBSD: scp.1,v 1.41 2007/05/31 19:20:16 jmc Exp $
+.\" $OpenBSD: scp.1,v 1.42 2007/08/06 19:16:06 sobrado Exp $
 .\"
-.Dd $Mdocdate: May 31 2007 $
+.Dd $Mdocdate: August 6 2007 $
 .Dt SCP 1
 .Os
 .Sh NAME
@@ -34,7 +34,7 @@
 .Ar host1 No :
 .Oc Ns Ar file1
 .Sm on
-.Op Ar ...
+.Ar ...
 .Sm off
 .Oo
 .Op Ar user No @
diff --git a/scp.c b/scp.c
index 0206e6f4e..1765a44e6 100644
--- a/scp.c
+++ b/scp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: scp.c,v 1.159 2007/06/13 00:21:27 djm Exp $ */
+/* $OpenBSD: scp.c,v 1.160 2007/08/06 19:16:06 sobrado Exp $ */
 /*
  * scp - secure remote copy.  This is basically patched BSD rcp which
  * uses ssh to do the data transfer (instead of using rcmd).
@@ -1120,7 +1120,7 @@ usage(void)
         (void) fprintf(stderr,
             "usage: scp [-1246BCpqrv] [-c cipher] [-F ssh_config] [-i identity_file]\n"
             "           [-l limit] [-o ssh_option] [-P port] [-S program]\n"
-            "           [[user@]host1:]file1 [...] [[user@]host2:]file2\n");
+            "           [[user@]host1:]file1 ... [[user@]host2:]file2\n");
         exit(1);
 }