upstream: fix missing -s in SYNOPSYS and usage() as well as a

capitalisation mistake; spotted by jmc@

OpenBSD-Commit-ID: 0ed8ee085c7503c60578941d8b45f3a61d4c9710

diff --git a/scp.1 b/scp.1
index d154e12c9ead3cb56f656bda007b969802f3d391..10cd4efb912a1f9053c961253f44dcae55ede590 100644 (file)
--- a/scp.1
+++ b/scp.1
@@ -8,7 +8,7 @@
 .\"
 .\" Created: Sun May  7 00:14:37 1995 ylo
 .\"
-.\" $OpenBSD: scp.1,v 1.104 2021/09/20 01:55:42 djm Exp $
+.\" $OpenBSD: scp.1,v 1.105 2021/09/20 06:53:56 djm Exp $
 .\"
 .Dd $Mdocdate: September 20 2021 $
 .Dt SCP 1
@@ -18,7 +18,7 @@
 .Nd OpenSSH secure file copy
 .Sh SYNOPSIS
 .Nm scp
-.Op Fl 346ABCOpqRrTv
+.Op Fl 346ABCOpqRrsTv
 .Op Fl c Ar cipher
 .Op Fl D Ar sftp_server_path
 .Op Fl F Ar ssh_config
@@ -258,7 +258,7 @@ The program must understand
 .Xr ssh 1
 options.
 .It Fl s
-use the SFTP protocol for transfers rather than the original scp protocol.
+Use the SFTP protocol for transfers rather than the original scp protocol.
 .It Fl T
 Disable strict filename checking.
 By default when copying files from a remote host to a local directory

diff --git a/scp.c b/scp.c
index e1ee3d9dd0f3d1e9f528830c34fbc7d61702d28f..73ce8554d7880487743173b8419784b6ea4d03d3 100644 (file)
--- a/scp.c
+++ b/scp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: scp.c,v 1.238 2021/09/20 01:55:42 djm Exp $ */
+/* $OpenBSD: scp.c,v 1.239 2021/09/20 06:53:56 djm Exp $ */
 /*
  * scp - secure remote copy.  This is basically patched BSD rcp which
  * uses ssh to do the data transfer (instead of using rcmd).
@@ -1985,7 +1985,7 @@ void
 usage(void)
 {
        (void) fprintf(stderr,
-           "usage: scp [-346ABCOpqRrTv] [-c cipher] [-D sftp_server_path] [-F ssh_config]\n"
+           "usage: scp [-346ABCOpqRrsTv] [-c cipher] [-D sftp_server_path] [-F ssh_config]\n"
            "           [-i identity_file] [-J destination] [-l limit]\n"
            "           [-o ssh_option] [-P port] [-S program] source ... target\n");
        exit(1);