Fri Jul 28 04:49:38 2023 UTC ()
sftp.1: Fix old (and non-critical) merge botch.


(rin)
diff -r1.28 -r1.29 src/crypto/external/bsd/openssh/dist/sftp.1
cvs diff -r1.28 -r1.29 src/crypto/external/bsd/openssh/dist/sftp.1 (expand / switch to unified diff)

--- src/crypto/external/bsd/openssh/dist/sftp.1 2023/07/26 17:58:15 1.28
+++ src/crypto/external/bsd/openssh/dist/sftp.1 2023/07/28 04:49:38 1.29
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1.\" $NetBSD: sftp.1,v 1.28 2023/07/26 17:58:15 christos Exp $ 1.\" $NetBSD: sftp.1,v 1.29 2023/07/28 04:49:38 rin Exp $
2.\" $OpenBSD: sftp.1,v 1.143 2022/12/16 03:40:03 djm Exp $ 2.\" $OpenBSD: sftp.1,v 1.143 2022/12/16 03:40:03 djm Exp $
3.\" 3.\"
4.\" Copyright (c) 2001 Damien Miller. All rights reserved. 4.\" Copyright (c) 2001 Damien Miller. All rights reserved.
5.\" 5.\"
6.\" Redistribution and use in source and binary forms, with or without 6.\" Redistribution and use in source and binary forms, with or without
7.\" modification, are permitted provided that the following conditions 7.\" modification, are permitted provided that the following conditions
8.\" are met: 8.\" are met:
9.\" 1. Redistributions of source code must retain the above copyright 9.\" 1. Redistributions of source code must retain the above copyright
10.\" notice, this list of conditions and the following disclaimer. 10.\" notice, this list of conditions and the following disclaimer.
11.\" 2. Redistributions in binary form must reproduce the above copyright 11.\" 2. Redistributions in binary form must reproduce the above copyright
12.\" notice, this list of conditions and the following disclaimer in the 12.\" notice, this list of conditions and the following disclaimer in the
13.\" documentation and/or other materials provided with the distribution. 13.\" documentation and/or other materials provided with the distribution.
14.\" 14.\"
@@ -448,27 +448,27 @@ The @@ -448,27 +448,27 @@ The
448flag requests display of inode information in addition to capacity information. 448flag requests display of inode information in addition to capacity information.
449This command is only supported on servers that implement the 449This command is only supported on servers that implement the
450.Dq statvfs@openssh.com 450.Dq statvfs@openssh.com
451extension. 451extension.
452.It Ic exit 452.It Ic exit
453Quit 453Quit
454.Nm sftp . 454.Nm sftp .
455.It Xo Ic get 455.It Xo Ic get
456.Op Fl afpR 456.Op Fl afpR
457.Ar remote-path 457.Ar remote-path
458.Op Ar local-path 458.Op Ar local-path
459.Xc 459.Xc
460Retrieve the 460Retrieve the
461.Ar remote-file 461.Ar remote-path
462and store it on the local machine. 462and store it on the local machine.
463If the local 463If the local
464path name is not specified, it is given the same name it has on the 464path name is not specified, it is given the same name it has on the
465remote machine. 465remote machine.
466.Ar remote-path 466.Ar remote-path
467may contain 467may contain
468.Xr glob 7 468.Xr glob 7
469characters and may match multiple files. 469characters and may match multiple files.
470If it does and 470If it does and
471.Ar local-path 471.Ar local-path
472is specified, then 472is specified, then
473.Ar local-path 473.Ar local-path
474must specify a directory. 474must specify a directory.