RepoMirrors
/
openssh
mirror of git://anongit.mindrot.org/openssh.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- jmc@cvs.openbsd.org 2010/12/09 14:13:33 

[scp.1 scp.c]
     scp.1: grammer fix
     scp.c: add -3 to usage()
This commit is contained in:
Damien Miller 2011-01-06 22:41:21 +11:00
parent f12114366b
commit 907998df72
3 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -5,6 +5,10 @@
add a new -3 option to scp: Copies between two remote hosts are add a new -3 option to scp: Copies between two remote hosts are
transferred through the local host. Without this option the data transferred through the local host. Without this option the data
is copied directly between the two remote hosts. ok djm@ (bugzilla #1837) 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 20110104
- (djm) [configure.ac Makefile.in] Use mandoc as preferred manpage - (djm) [configure.ac Makefile.in] Use mandoc as preferred manpage

6
scp.1
View File

@ -8,9 +8,9 @@
.\" .\"
.\" Created: Sun May 7 00:14:37 1995 ylo .\" 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 .Dt SCP 1
.Os .Os
.Sh NAME .Sh NAME
@ -79,7 +79,7 @@ to use protocol 2.
Copies between two remote hosts are transferred through the local host. Copies between two remote hosts are transferred through the local host.
Without this option the data is copied directly between the two remote Without this option the data is copied directly between the two remote
hosts. hosts.
Note that this options disables the progress meter. Note that this option disables the progress meter.
.It Fl 4 .It Fl 4
Forces Forces
.Nm .Nm

4
scp.c
View File

@ -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 * scp - secure remote copy. This is basically patched BSD rcp which
* uses ssh to do the data transfer (instead of using rcmd). * uses ssh to do the data transfer (instead of using rcmd).
@ -1214,7 +1214,7 @@ void
usage(void) usage(void)
{ {
(void) fprintf(stderr, (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" " [-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); exit(1);