summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorkn <kn@cvs.openbsd.org>2018-07-23 19:02:50 +0000
committerkn <kn@cvs.openbsd.org>2018-07-23 19:02:50 +0000
commit16266a6ea33dacb9703fe3e909d30a8b224913f7 (patch)
tree63935e41c4ac554a705cdfb6c3e7c134c4ae4e19
parente8cd273bceec2a8d4a1b11daf5e7983a4bba8e1f (diff)
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
-rw-r--r--bin/pax/pax.16
-rw-r--r--bin/pax/tar.110
-rw-r--r--usr.bin/ssh/sftp.120
-rw-r--r--usr.bin/ssh/ssh_config.56
-rw-r--r--usr.bin/tmux/tmux.16
-rw-r--r--usr.sbin/syslogd/syslog.conf.58
6 files changed, 29 insertions, 27 deletions
diff --git a/bin/pax/pax.1 b/bin/pax/pax.1
index 14242563ee2..8d197da469f 100644
--- a/bin/pax/pax.1
+++ b/bin/pax/pax.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: pax.1,v 1.73 2016/08/26 04:40:27 guenther Exp $
+.\" $OpenBSD: pax.1,v 1.74 2018/07/23 19:02:49 kn Exp $
.\" $NetBSD: pax.1,v 1.3 1995/03/21 09:07:37 cgd Exp $
.\"
.\" Copyright (c) 1992 Keith Muller.
@@ -34,7 +34,7 @@
.\"
.\" @(#)pax.1 8.4 (Berkeley) 4/18/94
.\"
-.Dd $Mdocdate: August 26 2016 $
+.Dd $Mdocdate: July 23 2018 $
.Dt PAX 1
.Os
.Sh NAME
@@ -205,7 +205,7 @@ The
operand is used to select one or more pathnames of archive members.
Archive members are selected using the pattern matching notation described
by
-.Xr glob 3 .
+.Xr glob 7 .
When the
.Ar pattern
operand is not supplied, all members of the archive will be selected.
diff --git a/bin/pax/tar.1 b/bin/pax/tar.1
index 6cfb8e25ef6..de49718bf69 100644
--- a/bin/pax/tar.1
+++ b/bin/pax/tar.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: tar.1,v 1.60 2017/10/09 15:54:39 millert Exp $
+.\" $OpenBSD: tar.1,v 1.61 2018/07/23 19:02:49 kn Exp $
.\"
.\" Copyright (c) 1996 SigmaSoft, Th. Lockert
.\" All rights reserved.
@@ -23,7 +23,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: October 9 2017 $
+.Dd $Mdocdate: July 23 2018 $
.Dt TAR 1
.Os
.Sh NAME
@@ -94,7 +94,7 @@ command line, only those files will be listed.
The
.Ar file
arguments may be specified as glob patterns (see
-.Xr glob 3
+.Xr glob 7
for more information), in which case
.Nm
will list all archive members that match each pattern.
@@ -109,7 +109,7 @@ archive.
The
.Ar file
arguments may be specified as glob patterns (see
-.Xr glob 3
+.Xr glob 7
for more information), in which case
.Nm
will extract all archive members that match each pattern.
@@ -344,7 +344,7 @@ to a file called
Verbosely create an archive, called
.Pa backup.tar.gz ,
of all files matching the shell
-.Xr glob 3
+.Xr glob 7
function
.Pa *.c :
.Pp
diff --git a/usr.bin/ssh/sftp.1 b/usr.bin/ssh/sftp.1
index 2ae5e354e81..a6210c50026 100644
--- a/usr.bin/ssh/sftp.1
+++ b/usr.bin/ssh/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/usr.bin/ssh/ssh_config.5 b/usr.bin/ssh/ssh_config.5
index 0e5bb907869..fe52578f46c 100644
--- a/usr.bin/ssh/ssh_config.5
+++ b/usr.bin/ssh/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.
diff --git a/usr.bin/tmux/tmux.1 b/usr.bin/tmux/tmux.1
index 6211f2c17ad..5b00b01ed8b 100644
--- a/usr.bin/tmux/tmux.1
+++ b/usr.bin/tmux/tmux.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: tmux.1,v 1.606 2018/07/06 07:11:23 nicm Exp $
+.\" $OpenBSD: tmux.1,v 1.607 2018/07/23 19:02:49 kn Exp $
.\"
.\" Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
.\"
@@ -14,7 +14,7 @@
.\" IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
.\" OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
.\"
-.Dd $Mdocdate: July 6 2018 $
+.Dd $Mdocdate: July 23 2018 $
.Dt TMUX 1
.Os
.Sh NAME
@@ -964,7 +964,7 @@ show debugging information about jobs and terminals.
Execute commands from
.Ar path
(which may be a
-.Xr glob 3
+.Xr glob 7
pattern).
If
.Fl q
diff --git a/usr.sbin/syslogd/syslog.conf.5 b/usr.sbin/syslogd/syslog.conf.5
index b444a6556a9..6f05330b733 100644
--- a/usr.sbin/syslogd/syslog.conf.5
+++ b/usr.sbin/syslogd/syslog.conf.5
@@ -26,10 +26,10 @@
.\" SUCH DAMAGE.
.\"
.\" from: @(#)syslog.conf.5 8.1 (Berkeley) 6/9/93
-.\" $OpenBSD: syslog.conf.5,v 1.37 2018/07/17 13:51:47 djm Exp $
+.\" $OpenBSD: syslog.conf.5,v 1.38 2018/07/23 19:02:49 kn Exp $
.\" $NetBSD: syslog.conf.5,v 1.4 1996/01/02 17:41:46 perry Exp $
.\"
-.Dd $Mdocdate: July 17 2018 $
+.Dd $Mdocdate: July 23 2018 $
.Dt SYSLOG.CONF 5
.Os
.Sh NAME
@@ -102,7 +102,9 @@ Each block of lines is separated from the previous block by a tag.
The tag is a line beginning with
.Em !prog
and each block will be associated with calls to syslog from that specific
-program (matched using shell globbing rules).
+program (matched using
+.Xr glob 7
+rules).
When a message matches multiple blocks, the action of each matching
block is taken.
If no tag is specified at the beginning of the file,