summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJason McIntyre <jmc@cvs.openbsd.org>2010-12-09 14:13:34 +0000
committerJason McIntyre <jmc@cvs.openbsd.org>2010-12-09 14:13:34 +0000
commit603205d36d970075dd71ce15ae2b18c8b7f9660b (patch)
tree5e27aa1ca36399ffa0c25ae5c9f0f0361985ff42
parentf4cb0a1d48212436bd622ab3febfd0a41bcf80fd (diff)
scp.1: grammer fix
scp.c: add -3 to usage()
-rw-r--r--usr.bin/ssh/scp.16
-rw-r--r--usr.bin/ssh/scp.c4
2 files changed, 5 insertions, 5 deletions
diff --git a/usr.bin/ssh/scp.1 b/usr.bin/ssh/scp.1
index 28bac5671ca..577dd52c1dd 100644
--- a/usr.bin/ssh/scp.1
+++ b/usr.bin/ssh/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 @@ to use protocol 2.
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/usr.bin/ssh/scp.c b/usr.bin/ssh/scp.c
index e4146e90690..fbab0c5b1bc 100644
--- a/usr.bin/ssh/scp.c
+++ b/usr.bin/ssh/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).
@@ -1185,7 +1185,7 @@ void
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);