Merge branch 'master' into vpcvpc

4 files changed, 139 insertions, 53 deletions

diff --git a/usr/src/man/man1/crontab.1 b/usr/src/man/man1/crontab.1
index c954036653..d48b995045 100644
--- a/usr/src/man/man1/crontab.1
+++ b/usr/src/man/man1/crontab.1
@@ -45,29 +45,24 @@
 .\" Copyright (c) 2011, Joyent, Inc. All Rights Reserved
 .\" Portions Copyright (c) 1992, X/Open Company Limited All Rights Reserved
 .\" Copyright (c) 2009, Sun Microsystems, Inc. All Rights Reserved
-.\" Copyright 2019 OmniOS Community Edition (OmniOSce) Association.
+.\" Copyright 2020 OmniOS Community Edition (OmniOSce) Association.
 .\"
-.TH CRONTAB 1 "Oct 22, 2019"
+.TH CRONTAB 1 "Aug 20, 2020"
 .SH NAME
 crontab \- user crontab file
 .SH SYNOPSIS
 .nf
-\fB/usr/bin/crontab\fR [\fIfilename\fR]
+\fB/usr/bin/crontab\fR [\fB-u\fR \fIusername\fR] [\fIfilename\fR]
 .fi
 
 .LP
 .nf
-\fB/usr/bin/crontab\fR \fB-e\fR [\fIusername\fR]
+\fB/usr/bin/crontab\fR \fB{ -e | -l | -r }\fR [\fIusername\fR]
 .fi
 
 .LP
 .nf
-\fB/usr/bin/crontab\fR \fB-l\fR [\fB-g\fR] [\fIusername\fR]
-.fi
-
-.LP
-.nf
-\fB/usr/bin/crontab\fR \fB-r\fR [\fIusername\fR]
+\fB/usr/bin/crontab\fR \fB-u\fR \fIusername\fR \fB{ -e | -g | -l | -r }\fR
 .fi
 
 .LP
@@ -77,17 +72,12 @@ crontab \- user crontab file
 
 .LP
 .nf
-\fB/usr/xpg4/bin/crontab\fR \fB-e\fR [\fIusername\fR]
+\fB/usr/xpg4/bin/crontab\fR \fB{ -e | -g | -l | -r }\fR [\fIusername\fR]
 .fi
 
 .LP
 .nf
-\fB/usr/xpg4/bin/crontab\fR \fB-l\fR [\fB-g\fR] [\fIusername\fR]
-.fi
-
-.LP
-.nf
-\fB/usr/xpg4/bin/crontab\fR \fB-r\fR [\fIusername\fR]
+\fB/usr/xpg4/bin/crontab\fR \fB-u\fR \fIusername\fR \fB{ -e | -l | -r }\fR
 .fi
 
 .LP
@@ -97,17 +87,12 @@ crontab \- user crontab file
 
 .LP
 .nf
-\fB/usr/xpg6/bin/crontab\fR \fB-e\fR [\fIusername\fR]
-.fi
-
-.LP
-.nf
-\fB/usr/xpg6/bin/crontab\fR \fB-l\fR [\fB-g\fR] [\fIusername\fR]
+\fB/usr/xpg6/bin/crontab\fR \fB{ -e | -g | -l | -r }\fR [\fIusername\fR]
 .fi
 
 .LP
 .nf
-\fB/usr/xpg6/bin/crontab\fR \fB-r\fR [\fIusername\fR]
+\fB/usr/xpg6/bin/crontab\fR \fB-u\fR \fIusername\fR \fB{ -e | -l | -r }\fR
 .fi
 
 .SH DESCRIPTION
@@ -119,7 +104,8 @@ users' crontabs.
 .sp
 .LP
 If \fBcrontab\fR is invoked with \fIfilename\fR, this overwrites an existing
-\fBcrontab\fR entry for the user that invokes it.
+\fBcrontab\fR entry for the user that invokes it, or for the user specified
+with the \fB-u\fR option.
 .sp
 .LP
 Cron supports a merged crontab with entries coming from either the user's
@@ -131,6 +117,8 @@ be customized by the user.  The dual set of crontab entries is only
 of interest to system-defined users such as \fBroot\fR.  Except where
 otherwise explicitly indicated, all variants of the \fBcrontab\fR command
 act only on the editable crontab files found in \fB/var/spool/cron/crontabs\fR.
+.sp
+.LP
 .SS "\fBcrontab\fR Access Control"
 Users: Access to \fBcrontab\fR is allowed:
 .RS +4
@@ -285,11 +273,11 @@ The following variables are supported:
 .sp
 .ne 2
 .na
-\fB\fBHOME\fR\fR
+\fBHOME\fR
 .ad
 .sp .6
 .RS 4n
-Allows the user to choose and alternative directory for cron to change
+Allows the user to choose an alternative directory for cron to change
 directory to prior to running the command. For example:
 .sp
 .in +2
@@ -304,7 +292,7 @@ HOME=/var/tmp
 .sp
 .ne 2
 .na
-\fB\fBSHELL\fR\fR
+\fBSHELL\fR
 .ad
 .sp .6
 .RS 4n
@@ -322,7 +310,7 @@ SHELL=/usr/bin/ksh
 .sp
 .ne 2
 .na
-\fB\fBTZ\fR\fR
+\fBTZ\fR
 .ad
 .sp .6
 .RS 4n
@@ -365,7 +353,7 @@ The following options are supported:
 .sp
 .ne 2
 .na
-\fB\fB-e\fR\fR
+\fB-e\fR
 .ad
 .RS 6n
 Edits a copy of the current user's \fBcrontab\fR file, or creates an empty file
@@ -392,7 +380,7 @@ editable.
 .sp
 .ne 2
 .na
-\fB\fB-l\fR\fR
+\fB-l\fR
 .ad
 .RS 6n
 Lists the \fBcrontab\fR file for the invoking user. Only root or a user with
@@ -419,7 +407,7 @@ also given.
 .sp
 .ne 2
 .na
-\fB\fB-r\fR\fR
+\fB-r\fR
 .ad
 .RS 6n
 Removes a user's \fBcrontab\fR from the \fBcrontab\fR directory. Only root or a
@@ -428,6 +416,18 @@ following the \fB-r\fR option to remove the \fBcrontab\fR file of the specified
 user.
 .RE
 
+.sp
+.ne 2
+.na
+\fB-u\fR \fIusername\fR
+.ad
+.RS 6n
+Specifies the name of the user whose \fBcrontab\fR is to be replaced, viewed or
+modified. This can only be done by root or by a user with the
+\fBsolaris.jobs.admin\fR authorization.
+
+.RE
+
 .SH EXAMPLES
 \fBExample 1 \fRCleaning up Core Files
 .sp
@@ -552,7 +552,7 @@ that affect the execution of \fBcrontab\fR: \fBLANG\fR, \fBLC_ALL\fR,
 .SS "\fB/usr/bin/crontab\fR"
 .ne 2
 .na
-\fB\fBEDITOR\fR\fR
+\fBEDITOR\fR
 .ad
 .RS 10n
 Determine the editor to be invoked when the \fB-e\fR option is specified. This
@@ -563,7 +563,7 @@ is overridden by the \fBVISUAL\fR environmental variable. The default editor is
 .sp
 .ne 2
 .na
-\fB\fBPATH\fR\fR
+\fBPATH\fR
 .ad
 .RS 10n
 The \fBPATH\fR in \fBcrontab\fR's environment specifies the search path used to
@@ -573,7 +573,7 @@ find the editor.
 .sp
 .ne 2
 .na
-\fB\fBVISUAL\fR\fR
+\fBVISUAL\fR
 .ad
 .RS 10n
 Determine the visual editor to be invoked when the \fB-e\fR option is
@@ -584,7 +584,7 @@ specified. If \fBVISUAL\fR is not specified, then the environment variable
 .SS "\fB/usr/xpg4/bin/crontab\fR"
 .ne 2
 .na
-\fB\fBEDITOR\fR\fR
+\fBEDITOR\fR
 .ad
 .RS 10n
 Determine the editor to be invoked when the \fB-e\fR option is specified. The
@@ -594,7 +594,7 @@ default editor is \fB/usr/xpg4/bin/vi\fR.
 .SS "\fB/usr/xpg6/bin/crontab\fR"
 .ne 2
 .na
-\fB\fBEDITOR\fR\fR
+\fBEDITOR\fR
 .ad
 .RS 10n
 Determine the editor to be invoked when the \fB-e\fR option is specified. The
@@ -606,7 +606,7 @@ The following exit values are returned:
 .sp
 .ne 2
 .na
-\fB\fB0\fR\fR
+\fB0\fR
 .ad
 .RS 6n
 Successful completion.
@@ -615,7 +615,7 @@ Successful completion.
 .sp
 .ne 2
 .na
-\fB\fB>0\fR\fR
+\fB>0\fR
 .ad
 .RS 6n
 An error occurred.
@@ -624,7 +624,7 @@ An error occurred.
 .SH FILES
 .ne 2
 .na
-\fB\fB/etc/cron.d\fR\fR
+\fB/etc/cron.d\fR
 .ad
 .RS 28n
 main cron directory
@@ -633,7 +633,7 @@ main cron directory
 .sp
 .ne 2
 .na
-\fB\fB/etc/cron.d/cron.allow\fR\fR
+\fB/etc/cron.d/cron.allow\fR
 .ad
 .RS 28n
 list of allowed users
@@ -642,7 +642,7 @@ list of allowed users
 .sp
 .ne 2
 .na
-\fB\fB/etc/default/cron\fR\fR
+\fB/etc/default/cron\fR
 .ad
 .RS 28n
 contains cron default settings
@@ -651,7 +651,7 @@ contains cron default settings
 .sp
 .ne 2
 .na
-\fB\fB/etc/cron.d/cron.deny\fR\fR
+\fB/etc/cron.d/cron.deny\fR
 .ad
 .RS 28n
 list of denied users
@@ -669,7 +669,7 @@ system spool area for \fBcrontab\fR
 .sp
 .ne 2
 .na
-\fB\fB/var/cron/log\fR\fR
+\fB/var/cron/log\fR
 .ad
 .RS 28n
 accounting information
@@ -678,7 +678,7 @@ accounting information
 .sp
 .ne 2
 .na
-\fB\fB/var/spool/cron/crontabs\fR\fR
+\fB/var/spool/cron/crontabs\fR
 .ad
 .RS 28n
 spool area for \fBcrontab\fR
diff --git a/usr/src/man/man1/find.1 b/usr/src/man/man1/find.1
index d393a3197d..3e1b3959ee 100644
--- a/usr/src/man/man1/find.1
+++ b/usr/src/man/man1/find.1
@@ -47,7 +47,7 @@
 .\" Copyright (c) 2013 Andrew Stormont.  All rights reserved.
 .\" Copyright 2020 Joyent, Inc.
 .\"
-.TH FIND 1 "Feb 20, 2020"
+.TH FIND 1 "Aug 23, 2020"
 .SH NAME
 find \- find files
 .SH SYNOPSIS
@@ -226,6 +226,18 @@ True if the file's status was changed \fIn\fR days ago.
 .sp
 .ne 2
 .na
+\fB\fB-delete\fR\fR
+.ad
+.RS 17n
+Always true. Deletes the files and folders found recursing from the current
+directory. This option implicitly enables \fB-depth\fR and is incompatible
+with following symlinks, if specified. For security reasons, relative paths
+starting with '\fB\&/\fR' are not allowed.
+.RE
+
+.sp
+.ne 2
+.na
 \fB\fB-depth\fR\fR
 .ad
 .RS 17n
diff --git a/usr/src/man/man1/grep.1 b/usr/src/man/man1/grep.1
index 92e25a96d3..be5014192d 100644
--- a/usr/src/man/man1/grep.1
+++ b/usr/src/man/man1/grep.1
@@ -44,8 +44,9 @@
 .\" Portions Copyright (c) 1992, X/Open Company Limited  All Rights Reserved
 .\" Copyright (c) 2008, Sun Microsystems, Inc.  All Rights Reserved
 .\" Copyright 2018 Nexenta Systems, Inc.
+.\" Copyright 2020 Oxide Computer Company
 .\"
-.Dd February 10, 2018
+.Dd August 13, 2020
 .Dt GREP 1
 .Os
 .Sh NAME
@@ -56,10 +57,11 @@
 .Sh SYNOPSIS
 .Nm grep
 .Op Fl E Ns | Ns Fl F
-.Op Fl bchHilnrRsqvwx
+.Op Fl bchHilLnorRsqvwx
 .Op Fl A Ar num
 .Op Fl B Ar num
 .Op Fl C Ar num Ns | Ns Fl Ns Ar num
+.Op Fl -label Ns = Ns Ar name
 .Oo Fl e Ar pattern_list Oc Ns ...
 .Oo Fl f Ar pattern_file Oc Ns ...
 .Op Ar pattern_list
@@ -107,7 +109,9 @@ delimiter line.
 .It Fl c
 Prints only a count of the lines that contain the pattern.
 Overrides
-.Fl l .
+.Fl l
+and
+.Fl L .
 .It Fl C Ar num Ns \&, Fl Ns Ar num
 Prints
 .Ar num
@@ -164,22 +168,71 @@ Used when searching multiple files.
 Precedes each line by the name of the file containing the matching line.
 .It Fl i
 Ignores upper/lower case distinction during comparisons.
+.It Fl -label Ns = Ns Ar name
+When the name of the matching file is printed
+.Pq Fl H ,
+instead of printing the string
+.Ql (standard input)
+the string
+.Ar name
+is printed instead.
+See
+.Sx Example 5 .
 .It Fl l
 Prints only the names of files with matching lines, separated by NEWLINE
 characters.
 Does not repeat the names of files when the pattern is found more than once.
+If both
+.Fl l
+and
+.Fl L
+are specified, only the last specified takes effect.
+Overrides
+.Fl H .
+.It Fl L
+The opposite of the
+.Fl l
+flag.
+Prints only the names of files without matching lines.
+If both
+.Fl l
+and
+.Fl L
+are specified, only the last specified takes effect.
 Overrides
 .Fl H .
 .It Fl n
 Precedes each line by its line number in the file (first line is 1).
+.It Fl o
+Prints only the matching part of a line.
+If a pattern appears more than once in a line, it will be matched and
+printed multiple times.
+.Pp
+The
+.Fl o
+option is overridden when any of the
+.Fl l ,
+.Fl L ,
+or
+.Fl c
+options are specified.
+When the
+.Fl o
+option is specified, all context options are ignored.
+The
+.Fl o
+and
+.Fl v
+options are not supported together at this time.
 .It Fl q
 Quiet.
 Does not write anything to the standard output, regardless of matching lines.
 Exits with zero status if an input line is selected.
 Overrides
-.Fl c
+.Fl c ,
+.Fl l ,
 and
-.Fl l .
+.Fl L .
 .It Fl r
 Read all files under each directory, recursively.
 Follow symbolic links on the command line, but skip symlinks that are
@@ -341,6 +394,20 @@ $ grep -E '^abc$
 $ grep -F -x 'abc
 def'
 .Ed
+.It Sy Example 5 No Using Fl -label
+When piping standard input into
+.Nm ,
+as part of a pipeline, occasionally it can be useful override the file
+name
+.Ql (standard input)
+with something from the pipeline.
+This would output each matching line instead with the name of the input
+file.
+.Bd -literal
+$ for f in *.gz; do
+> gzcat $f | grep -H --label=$f foo
+> done
+.Ed
 .El
 .Sh ENVIRONMENT VARIABLES
 See
diff --git a/usr/src/man/man1/sed.1 b/usr/src/man/man1/sed.1
index 441f877919..f581279fc6 100644
--- a/usr/src/man/man1/sed.1
+++ b/usr/src/man/man1/sed.1
@@ -1,6 +1,9 @@
 .\" Copyright (c) 1992, 1993
 .\"     The Regents of the University of California.  All rights reserved.
 .\"
+.\" Copyright 2011 Nexenta Systems, Inc. All rights reserved.
+.\" Copyright 2020 OmniOS Community Edition (OmniOSce) Association.
+.\"
 .\" This code is derived from software contributed to Berkeley by
 .\" the Institute of Electrical and Electronics Engineers, Inc.
 .\"
@@ -28,7 +31,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.TH SED 1 "Aug 7, 2020"
+.TH SED 1 "Aug 21, 2020"
 .SH NAME
 \fBsed\fP
 \- stream editor
@@ -152,7 +155,7 @@ option suppresses this behavior.
 Same as
 \fB\-E\fP
 for compatibility with GNU sed.
-
+.PP
 The form of a
 \fBsed\fP
 command is as follows:
@@ -177,6 +180,10 @@ deletes the pattern space.
 Some of the functions use a
 .IR "hold space"
 to save all or part of the pattern space for subsequent retrieval.
+
+If an input file is growing while sed is running, the
+``$''
+address match may be unreliable.
 .SH "Sed Addresses"
 An address is not required, but if specified must have one of the
 following formats: