summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkn@openbsd.org <kn@openbsd.org>2018-07-23 19:02:49 +0000
committerDamien Miller <djm@mindrot.org>2018-07-26 13:54:30 +1000
commitddf1b797c2d26bbbc9d410aa4f484cbe94673587 (patch)
tree5ba31c97f9a608f82814e66fe928c3e48c9d9aa0
parent01c98d9661d0ed6156e8602b650f72eed9fc4d12 (diff)
upstream: Point to glob in section 7 for the actual list of special
characters instead the C API in section 3. OK millert jmc nicm, "the right idea" deraadt OpenBSD-Commit-ID: a74fd215488c382809e4d041613aeba4a4b1ffc6
-rw-r--r--sftp.120
-rw-r--r--ssh_config.56
2 files changed, 13 insertions, 13 deletions
diff --git a/sftp.1 b/sftp.1
index 2ae5e354..a6210c50 100644
--- a/sftp.1
+++ b/sftp.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: sftp.1,v 1.117 2018/07/19 10:28:47 dtucker Exp $
+.\" $OpenBSD: sftp.1,v 1.118 2018/07/23 19:02:49 kn Exp $
.\"
.\" Copyright (c) 2001 Damien Miller. All rights reserved.
.\"
@@ -22,7 +22,7 @@
.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
.\"
-.Dd $Mdocdate: July 19 2018 $
+.Dd $Mdocdate: July 23 2018 $
.Dt SFTP 1
.Os
.Sh NAME
@@ -315,7 +315,7 @@ to
.Ar grp .
.Ar path
may contain
-.Xr glob 3
+.Xr glob 7
characters and may match multiple files.
.Ar grp
must be a numeric GID.
@@ -326,7 +326,7 @@ to
.Ar mode .
.Ar path
may contain
-.Xr glob 3
+.Xr glob 7
characters and may match multiple files.
.It Ic chown Ar own Ar path
Change owner of file
@@ -335,7 +335,7 @@ to
.Ar own .
.Ar path
may contain
-.Xr glob 3
+.Xr glob 7
characters and may match multiple files.
.Ar own
must be a numeric UID.
@@ -373,7 +373,7 @@ path name is not specified, it is given the same name it has on the
remote machine.
.Ar remote-path
may contain
-.Xr glob 3
+.Xr glob 7
characters and may match multiple files.
If it does and
.Ar local-path
@@ -429,7 +429,7 @@ may contain any flags supported by the local system's
command.
.Ar path
may contain
-.Xr glob 3
+.Xr glob 7
characters and may match multiple files.
.It Ic lmkdir Ar path
Create local directory specified by
@@ -460,7 +460,7 @@ or the current directory if
is not specified.
.Ar path
may contain
-.Xr glob 3
+.Xr glob 7
characters and may match multiple files.
.Pp
The following flags are recognized and alter the behaviour of
@@ -513,7 +513,7 @@ If the remote path name is not specified, it is given the same name it has
on the local machine.
.Ar local-path
may contain
-.Xr glob 3
+.Xr glob 7
characters and may match multiple files.
If it does and
.Ar remote-path
@@ -616,7 +616,7 @@ Synonym for help.
.Xr ssh 1 ,
.Xr ssh-add 1 ,
.Xr ssh-keygen 1 ,
-.Xr glob 3 ,
+.Xr glob 7 ,
.Xr ssh_config 5 ,
.Xr sftp-server 8 ,
.Xr sshd 8
diff --git a/ssh_config.5 b/ssh_config.5
index 0e5bb907..fe52578f 100644
--- a/ssh_config.5
+++ b/ssh_config.5
@@ -33,8 +33,8 @@
.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
.\"
-.\" $OpenBSD: ssh_config.5,v 1.280 2018/07/19 10:28:47 dtucker Exp $
-.Dd $Mdocdate: July 19 2018 $
+.\" $OpenBSD: ssh_config.5,v 1.281 2018/07/23 19:02:49 kn Exp $
+.Dd $Mdocdate: July 23 2018 $
.Dt SSH_CONFIG 5
.Os
.Sh NAME
@@ -926,7 +926,7 @@ to unknown options that appear before it.
.It Cm Include
Include the specified configuration file(s).
Multiple pathnames may be specified and each pathname may contain
-.Xr glob 3
+.Xr glob 7
wildcards and, for user configurations, shell-like
.Sq ~
references to user home directories.