[illumos-gate merge]

commit 8f5edf1f887948e6be5982cbe7f196909927af91
    10417 recursive chown should not traverse any symbolic links by default
commit 0fa1b3cc784fb6db7999ec330ee54256171c1143
    10500 Refactor dmu_recv into its own file
commit 051a710dcbf091c85ceb0f5d86bd684a64639477
    10504 zfs-test deadlist_lock leaves behind orphan destructive dtrace probe
commit cbf54fed071131ba3446db06df29807d639650ab
    10125 smatch fixes for cmd-inet

	Conflicts:
	usr/src/pkg/manifests/system-test-utiltest.mf
	usr/src/test/util-tests/tests/Makefile
	usr/src/uts/common/fs/zfs/dmu_send.c
	usr/src/uts/common/fs/zfs/dmu_recv.c

1 files changed, 18 insertions, 58 deletions

diff --git a/usr/src/man/man1/chgrp.1 b/usr/src/man/man1/chgrp.1
index 795bc56f66..cab549e34b 100644
--- a/usr/src/man/man1/chgrp.1
+++ b/usr/src/man/man1/chgrp.1
@@ -49,7 +49,7 @@
 .\" Portions Copyright (c) 1992, X/Open Company Limited  All Rights Reserved
 .\" Copyright (c) 2003, Sun Microsystems, Inc.  All Rights Reserved
 .\"
-.TH CHGRP 1 "Jul 11, 2008"
+.TH CHGRP 1 "Feb 21, 2019"
 .SH NAME
 chgrp \- change file group ownership
 .SH SYNOPSIS
@@ -74,7 +74,6 @@ chgrp \- change file group ownership
 .fi
 
 .SH DESCRIPTION
-.sp
 .LP
 The \fBchgrp\fR utility will set the group ID of the file named by each
 \fIfile\fR operand to the group ID specified by the \fIgroup\fR operand.
@@ -136,10 +135,9 @@ set rstchown = 0
 \fB_POSIX_CHOWN_RESTRICTED\fR is enabled by default. See \fBsystem\fR(4) and
 \fBfpathconf\fR(2).
 .SH OPTIONS
-.sp
 .LP
 The following options are supported.
-.SS "/usr/bin/chgrp and /usr/xpg4/bin/chgrp"
+
 .sp
 .ne 2
 .na
@@ -202,49 +200,34 @@ of the file hierarchy.
 .sp
 .ne 2
 .na
-\fB\fB-s\fR\fR
-.ad
-.RS 6n
-The specified group is Windows SID. This option requires a file system that
-supports storing SIDs, such as ZFS.
-.RE
-
-.sp
-.LP
-Specifying more than one of the mutually-exclusive options \fB-H\fR, \fB-L\fR,
-or \fB-P\fR is not considered an error. The last option specified determines
-the behavior of \fBchgrp\fR.
-.SS "/usr/bin/chgrp"
-.sp
-.ne 2
-.na
 \fB\fB-R\fR\fR
 .ad
 .RS 6n
 Recursive. \fBchgrp\fR descends through the directory, and any subdirectories,
 setting the specified group \fBID\fR as it proceeds. When a symbolic link is
-encountered, the group of the target file is changed, unless the \fB-h\fR or
-\fB-P\fR option is specified. However, no recursion takes place, unless the
-\fB-H\fR or \fB-L\fR option is specified.
+encountered, the group of the of the symbolic link is changed, unless the
+\fB-H\fR or \fB-L\fR option is specified. Unless the \fB-H\fR, \fB-L\fR,
+or \fB-P\fR option is specified, the \fB-P\fR option is used as the default mode.
 .RE
 
-.SS "/usr/xpg4/bin/chgrp"
 .sp
 .ne 2
 .na
-\fB\fB-R\fR\fR
+\fB\fB-s\fR\fR
 .ad
 .RS 6n
-Recursive. \fBchgrp\fR descends through the directory, and any subdirectories,
-setting the specified group \fBID\fR as it proceeds. When a symbolic link is
-encountered, the group of the target file is changed, unless the \fB-h\fR or
-\fB-P\fR option is specified. Unless the \fB-H\fR, \fB-L\fR, or \fB-P\fR option
-is specified, the \fB-L\fR option is used as the default mode.
+The specified group is Windows SID. This option requires a file system that
+supports storing SIDs, such as ZFS.
 .RE
 
-.SH OPERANDS
 .sp
 .LP
+Specifying more than one of the mutually-exclusive options \fB-H\fR, \fB-L\fR,
+or \fB-P\fR is not considered an error. The last option specified determines
+the behavior of \fBchgrp\fR.
+
+.SH OPERANDS
+.LP
 The following operands are supported:
 .sp
 .ne 2
@@ -268,18 +251,15 @@ A path name of a file whose group ID is to be modified.
 .RE
 
 .SH USAGE
-.sp
 .LP
 See \fBlargefile\fR(5) for the description of the behavior of \fBchgrp\fR when
 encountering files greater than or equal to 2 Gbyte (2^31 bytes).
 .SH ENVIRONMENT VARIABLES
-.sp
 .LP
 See \fBenviron\fR(5) for descriptions of the following environment variables
 that affect the execution of \fBchgrp\fR: \fBLANG\fR, \fBLC_ALL\fR,
 \fBLC_CTYPE\fR, \fBLC_MESSAGES\fR, and \fBNLSPATH\fR.
 .SH EXIT STATUS
-.sp
 .LP
 The following exit values are returned:
 .sp
@@ -301,7 +281,6 @@ An error occurred.
 .RE
 
 .SH FILES
-.sp
 .ne 2
 .na
 \fB\fB/etc/group\fR\fR
@@ -311,30 +290,9 @@ group file
 .RE
 
 .SH ATTRIBUTES
-.sp
 .LP
 See \fBattributes\fR(5) for descriptions of the following attributes:
-.SS "/usr/bin/chgrp"
-.sp
 
-.sp
-.TS
-box;
-c | c
-l | l .
-ATTRIBUTE TYPE	ATTRIBUTE VALUE
-_
-CSI	Enabled. See NOTES.
-_
-Interface Stability	Committed
-_
-Standard	See \fBstandards\fR(5).
-.TE
-
-.SS "/usr/xpg4/bin/chgrp"
-.sp
-
-.sp
 .TS
 box;
 c | c
@@ -349,12 +307,14 @@ Standard	See \fBstandards\fR(5).
 .TE
 
 .SH SEE ALSO
-.sp
 .LP
 \fBchmod\fR(1), \fBchown\fR(1), \fBid\fR(1M), \fBchown\fR(2),
 \fBfpathconf\fR(2), \fBgroup\fR(4), \fBpasswd\fR(4), \fBsystem\fR(4),
 \fBattributes\fR(5), \fBenviron\fR(5), \fBlargefile\fR(5), \fBstandards\fR(5)
 .SH NOTES
-.sp
 .LP
 \fBchgrp\fR is CSI-enabled except for the \fIgroup\fR name.
+.sp
+.LP
+In the past the behavior of \fB/usr/xpg4/bin/chgrp\fR and
+\fB/usr/bin/chgrp\fR utilities was different. Now they behave the same way.