[illumos-gate merge]release-20160625

commit 01aaaf328842760a1002109b299908a027e94cf8
    7051 want id_space(9F) docs
commit c1de7575521deda5ee777b8054a9c5b12f15b1ee
    7120 mDNS resync was not wsdiff safe
commit 9c05409f2b9301e686735887a9573454cceb0331
    7069 i386_XARCH should include -m32
commit 406fc5100dac8d225a315a6def6be8d628f34e24
    6602 lofi should support labeled devices
commit f3a07f941f1be263a48a040c059edbcb722cf436
    4712 Prefer 'parsable' over 'parseable' in the manual pages
commit 1b2031a95889aea96be6af55dcf31a0d5ffdfed9
    7050 Prefer 'subcommand' over 'sub-command' in the manual pages
commit 831b40b1c811223fd0b1131791a38e3ae5143377
    7049 Prefer 'writable' over 'writeable' in the manual pages
commit a716f1a92056bc2e231e57ae2a20725ce606ea73
    7047 Fix spelling mistakes in sections 9E, 9F and 9S
commit 95e15299a2c42b8014fa27631a6f3be2a93febc2
    7048 Fix spelling mistakes in sections 7D, 7I, 7IPP, and 7P
commit df23565fe1d0b225f9f898c50dfafea6749b0b7f
    7046 Fix spelling mistakes in section 5
commit c855112f85cf71e42f6381a66f3f86f98e2ed24e
    7045 Fix spelling mistakes in section 4
commit 843c398e8904ed9d833d2af3103894f909fb4b52
    7042 Fix spelling mistakes in library sections
commit 0db8de19c0e494758b68b702523a2b0eaffe3b2e
    7044 Fix spelling mistakes in sections 1HAS and 2
commit df23d905b96680e56379c5a5ecb4b363f36b9e74
    7041 Fix spelling mistakes in sections 1 and 1M
commit 71af3be340c57171837478555e2eb0d496318cfc
    7040 Detect common spelling errors in manual pages

	Conflicts:
	usr/src/uts/common/fs/vfs.c
	usr/src/man/man7d/cpuid.7d
	usr/src/man/man5/privileges.5
	usr/src/man/man3c/signalfd.3c
	usr/src/cmd/lofiadm/main.c

2 files changed, 6 insertions, 17 deletions

diff --git a/usr/src/man/man7p/dlpi.7p b/usr/src/man/man7p/dlpi.7p
index 6852799626..c2ffdc6889 100644
--- a/usr/src/man/man7p/dlpi.7p
+++ b/usr/src/man/man7p/dlpi.7p
@@ -3,7 +3,7 @@
 .\" The contents of this file are subject to the terms of the Common Development and Distribution License (the "License"). You may not use this file except in compliance with the License. You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing.
 .\"  See the License for the specific language governing permissions and limitations under the License. When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE. If applicable, add the following below this CDDL HEADER, with the
 .\" fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner]
-.TH DLPI 7P "Sep 7, 2009"
+.TH DLPI 7P "April 9, 2016"
 .SH NAME
 dlpi \- Data Link Provider Interface
 .SH SYNOPSIS
@@ -13,7 +13,6 @@ dlpi \- Data Link Provider Interface
 .fi
 
 .SH DESCRIPTION
-.sp
 .LP
 SunOS STREAMS-based device drivers wishing to support the STREAMS \fB TCP/IP\fR
 and other STREAMS-based networking protocol suite implementations support
@@ -43,7 +42,6 @@ Solaris conforms to The Open Group Technical Standard for \fIDLPI, Version
 \fIwww.opengroup.org/pubs/catalog/c811.htm\fR. Solaris also provides extensions
 to the DLPI standard, as detailed in this man page.
 .SH SOLARIS-SPECIFIC DLPI EXTENSIONS
-.sp
 .ne 2
 .na
 \fBNotification Support\fR
@@ -155,7 +153,7 @@ set to zero by DLPI providers and ignored by DLPI consumers.
 .sp
 In addition to generating DL_NOTIFY_IND messages when a requested event has
 occurred, the \fBDLPI\fR provider must initially generate one or more
-DL_NOTIFY_IND messages to notify the \fBDLPI\fR consumer of the the current
+DL_NOTIFY_IND messages to notify the \fBDLPI\fR consumer of the current
 state of the interface. For instance, if the consumer has requested
 DL_NOTE_LINK_UP | DL_NOTE_LINK_DOWN, the provider must send a DL_NOTIFY_IND
 containing the current state of the link (either DL_NOTE_LINK_UP or
@@ -166,7 +164,7 @@ recommended against sending DL_NOTE_LINK_DOWN, even if the interface is still
 initializing and is not yet ready to send or receive packets. Instead, either
 delaying the DL_NOTIFY_IND message until the interface is ready or
 optimistically reporting DL_NOTIFY_LINK_UP and subsequently   reporting
-DL_NOTE_LINK_DOWN if the negotation fails is strongly   preferred. This
+DL_NOTE_LINK_DOWN if the negotiation fails is strongly   preferred. This
 prevents DL_NOTIFY_IND consumers from needlessly triggering network failover
 operations and logging error messages during network interface initialization.
 .sp
@@ -241,7 +239,7 @@ the links do not have any DLPI consumers or only \fBpassive\fR consumers.
 .RS 4n
 The \fBDLIOCRAW\fR ioctl function is used by some DLPI applications, most
 notably the \fBsnoop\fR(1M) command. The \fBDLIOCRAW\fR command puts the stream
-into a raw mode, which, upon receive, causes the the full MAC-level packet to
+into a raw mode, which, upon receive, causes the full MAC-level packet to
 be sent upstream in an \fBM_DATA\fR message instead of it being transformed
 into the \fBDL_UNITDATA_IND\fR form normally used for reporting incoming
 packets. Packet \fBSAP\fR filtering is still performed on streams that are in
@@ -297,7 +295,6 @@ size.
 .SH DL_ETHER-SPECIFIC DLPI SEMANTICS
 .SS "VLAN Support"
 .SS "Traditional VLAN Access"
-.sp
 .LP
 Some \fBDL_ETHER DLPI\fR providers support \fIIEEE 802.1Q\fR Virtual LANs
 (VLAN). For these providers, traffic for a particular VLAN can be accessed by
@@ -311,7 +308,6 @@ are added by the provider) and received data is passed to interested DLPI
 consumers without link-layer headers.  As a result,  DLPI consumers not require
 special-case logic to implement VLAN access.
 .SS "SAP-Based VLAN Access"
-.sp
 .LP
 As per \fIIEEE 802.1Q\fR, all VLAN traffic is sent using Ether- Type  0x8100,
 meaning  that in addition to directly opening a VLAN data-link, all VLAN
@@ -333,7 +329,6 @@ enables promiscuous mode of a stream at the \fBDL_PROMISC_SAP\fR level. As
 mentioned earlier, these packets are received starting with their VLAN headers
 if raw mode is not enabled.
 .SS "QoS Support"
-.sp
 .LP
 The \fIIEEE 802.1Q\fR standard defines eight classes of priority values used by
 QoS traffic control of Ethernet packets. Although the priority values are
@@ -349,7 +344,6 @@ also specify the per-packet priority value using the b_band field of a M_DATA
 message or the \fBdl_priority\fR field of a \fBDL_UNITDATA_REQ\fR.
 .SS "Raw Mode"
 .SS "SAP-Based VLAN Access"
-.sp
 .LP
 When raw mode is enabled, the complete, unmodified MAC- level packet (including
 Ethernet  and  VLAN headers) is passed to interested DLPI consumers. Similarly,
@@ -358,7 +352,6 @@ to the DLPI provider for transmission.  Note that the priority value specified
 in the b_band field can be overridden by encoding the priority value (if any)
 into the VLAN header.
 .SS "Traditional VLAN Access"
-.sp
 .LP
 When raw mode is enabled, only packets with the correct VLAN ID are passed up
 to interested DLPI consumers. With the exception of priority-tagged packets,
@@ -375,11 +368,9 @@ the VLAN header to  indicate the priority value, however its VLAN ID must be
 zero. The DLPI providers then insert the VLAN tags or encode the VLAN tags
 using the priority value specified in the VLAN headers and send the packets.
 .SH FILES
-.sp
 .LP
 Files in or under \fB/dev\fR.
 .SH ATTRIBUTES
-.sp
 .LP
 See \fBattributes\fR(5) for descriptions of the following attributes:
 .sp
@@ -397,12 +388,10 @@ T}	Committed
 .TE
 
 .SH SEE ALSO
-.sp
 .LP
 \fBdladm\fR(1M), \fBsnoop\fR(1M), \fBlibdlpi\fR(3LIB), \fBgld\fR(7D),
 \fBip\fR(7P)
 .SH NOTES
-.sp
 .LP
 A Solaris DLPI link name consists of a \fBDLPI provider name\fR followed by a
 numeric \fBPPA\fR (physical point of attachment).
diff --git a/usr/src/man/man7p/route.7p b/usr/src/man/man7p/route.7p
index bbd74fd740..22d4f4c735 100644
--- a/usr/src/man/man7p/route.7p
+++ b/usr/src/man/man7p/route.7p
@@ -7,7 +7,7 @@
 .\" OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
 .\" IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\" Portions Copyright (c) 2009, Sun Microsystems, Inc. All Rights Reserved.
-.TH ROUTE 7P "Sep 02, 2015"
+.TH ROUTE 7P "April 9, 2016"
 .SH NAME
 route \- kernel packet forwarding database
 .SH SYNOPSIS
@@ -91,7 +91,7 @@ are exhausted.
 .sp
 .LP
 The \fIprotocol\fR parameter specifies which messages an application listening
-on the routing socket is interested in seeing, based on the the address family
+on the routing socket is interested in seeing, based on the address family
 of the \fBsockaddrs\fR present. Currently, you can specify \fBAF_INET\fR and
 \fBAF_INET6\fR to filter the messages seen by the listener, or alternatively,
 you can specify \fBAF_UNSPEC\fR to indicate that the listener is interested in