- jmc@cvs.openbsd.org 2010/12/09 14:13:33
[scp.1 scp.c]
scp.1: grammer fix
scp.c: add -3 to usage()
diff --git a/ChangeLog b/ChangeLog
index aa98f99..9b84654 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,10 @@
add a new -3 option to scp: Copies between two remote hosts are
transferred through the local host. Without this option the data
is copied directly between the two remote hosts. ok djm@ (bugzilla #1837)
+ - jmc@cvs.openbsd.org 2010/12/09 14:13:33
+ [scp.1 scp.c]
+ scp.1: grammer fix
+ scp.c: add -3 to usage()
20110104
- (djm) [configure.ac Makefile.in] Use mandoc as preferred manpage
diff --git a/scp.1 b/scp.1
index 28bac56..577dd52 100644
--- a/scp.1
+++ b/scp.1
@@ -8,9 +8,9 @@
.\"
.\" Created: Sun May 7 00:14:37 1995 ylo
.\"
-.\" $OpenBSD: scp.1,v 1.55 2010/12/08 22:46:03 markus Exp $
+.\" $OpenBSD: scp.1,v 1.56 2010/12/09 14:13:32 jmc Exp $
.\"
-.Dd $Mdocdate: December 8 2010 $
+.Dd $Mdocdate: December 9 2010 $
.Dt SCP 1
.Os
.Sh NAME
@@ -79,7 +79,7 @@
Copies between two remote hosts are transferred through the local host.
Without this option the data is copied directly between the two remote
hosts.
-Note that this options disables the progress meter.
+Note that this option disables the progress meter.
.It Fl 4
Forces
.Nm
diff --git a/scp.c b/scp.c
index 1262e0a..18b2597 100644
--- a/scp.c
+++ b/scp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: scp.c,v 1.169 2010/12/08 22:46:03 markus Exp $ */
+/* $OpenBSD: scp.c,v 1.170 2010/12/09 14:13:33 jmc Exp $ */
/*
* scp - secure remote copy. This is basically patched BSD rcp which
* uses ssh to do the data transfer (instead of using rcmd).
@@ -1214,7 +1214,7 @@
usage(void)
{
(void) fprintf(stderr,
- "usage: scp [-1246BCpqrv] [-c cipher] [-F ssh_config] [-i identity_file]\n"
+ "usage: scp [-12346BCpqrv] [-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");
exit(1);