From aa4d5eda10363af5a830e5723857751cb98b6fc8 Mon Sep 17 00:00:00 2001
From: Darren Tucker <dtucker@zip.com.au>
Date: Tue, 5 Jun 2007 18:27:13 +1000
Subject:    - jmc@cvs.openbsd.org 2007/05/31 19:20:16      [scp.1 ssh_config.5
 sftp-server.8 ssh-agent.1 sshd_config.5 sftp.1      ssh-keygen.1
 ssh-keyscan.1 ssh-add.1 sshd.8 ssh.1 ssh-keysign.8]      convert to new .Dd
 format;      (We will need to teach mdoc2man.awk to understand this too.)

---
 scp.1 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'scp.1')

diff --git a/scp.1 b/scp.1
index 43662abea..17140e37a 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.40 2006/07/18 07:56:28 jmc Exp $
+.\" $OpenBSD: scp.1,v 1.41 2007/05/31 19:20:16 jmc Exp $
 .\"
-.Dd September 25, 1999
+.Dd $Mdocdate: May 31 2007 $
 .Dt SCP 1
 .Os
 .Sh NAME
-- 
cgit v1.2.3


From 647d97b1ab1f8ef4dfa6c7a085b409e1c3609c6f Mon Sep 17 00:00:00 2001
From: Damien Miller <djm@mindrot.org>
Date: Wed, 8 Aug 2007 14:29:58 +1000
Subject:    - 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@

---
 ChangeLog | 8 +++++++-
 scp.1     | 6 +++---
 scp.c     | 4 ++--
 3 files changed, 12 insertions(+), 6 deletions(-)

(limited to 'scp.1')

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);
 }
 
-- 
cgit v1.2.3