[illumos-gate merge]

commit a4888653b44963eab5e74d73b1ac425648d2e62b
    6828 iprb should have alias for pci8086,1064
commit 6a19b8666104dbf912da5a4fb193c9c2b29e21bb
    4740 kstat(1M) prints wrong snaptime
commit 1ef6182819f36233702ddc54686e703bb23a0153
    2902 iscsit should fold the case of scsi names that we get from initiators
commit 2e27316f97ec8fac1caee78fe7fe05306261e070
    439 Need man page for timegm()
commit 5335409b2fd9c9c1d570d3e83bd2386dd8f526de
    6001 strcat(9f) needs a manpage
commit b6dd77d465d357e7777305038b5579625ae268c1
    6726 ctype(3C): missing description for isxdigit_l
commit aa9ab05c0bbc3211e983fe34e9174559f1462665
    4704 thr_sigsetmask(3c): Minor typos in the man page
commit efbf89fbc68a0864d303fe237fc420cf018d52f7
    6497 nvlist_empty() needs to appear in man pages
commit a6ae009119d792a981d8b7153f8cb3851fe04ebb
    6471 avl_remove(9F) man page is needed
commit 79192153bee37eb85baa06695c8a483f93466f71
    6489 atomic_bits(3C) should list atomic_ops(3C) in See Also
commit 22f7b4012dd9e585f59664dcaf9573289230d516
    6241 Minor typo in mount_nfs(1m) man page
commit 4bfcae809e209680a47fe4a1a1d2ed8f5ad0790f
    6693 mdoc(5): typos in MT-LEVEL names
commit 44f88c2eeb6a7c329d82467a31c4a501eae16fec
    6721 tran_setup_pkt(9E) returns int, not a pointer
commit 4854f07f374eaa71835ef1badc7ba55466f85ef9
    6718 tran_tgt_init(9E) returns int, not void
commit 979eca435dd26bdb0460d501038ad90a972807d1
    6783 ddi_fm_service_impact has wrong synopsis
commit 7bc870e686dc02eed8049c71d916e03f1c233a1a
    6753 remove acpi_fw.h
commit e5b33823e7efd785e2f2ada4683abdef7c2a436c
    6817 libbe should not free string from nvlist_lookup_string()
commit e4cb59f791c5c6dea7ad4caa6dee845024ce71ef
    6781 zpool man page needs updated to remove duplicate entry of "cannot be" where it discusses cache devices
commit 63d0f4f15e0d9605137029897b712a2774ed7fa8
    6746 startup_bios_disk() should not be built for xpv
commit 797f979d1fe26bfb1cdeb3e7a86ed24c0b654200
    6684 Allow sending from IPv6 SLAAC addresses within a zone using IP spoofing protection

	Conflicts:
	usr/src/man/man9f/Makefile
	usr/src/uts/common/io/mac/mac_protect.c

1 files changed, 3 insertions, 7 deletions

diff --git a/usr/src/man/man3lib/libnvpair.3lib b/usr/src/man/man3lib/libnvpair.3lib
index 947fbf6b48..0279ba94a2 100644
--- a/usr/src/man/man3lib/libnvpair.3lib
+++ b/usr/src/man/man3lib/libnvpair.3lib
@@ -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 LIBNVPAIR 3LIB "Aug 1, 2008"
+.TH LIBNVPAIR 3LIB "Mar 13, 2016"
 .SH NAME
 libnvpair \- name-value pair library
 .SH SYNOPSIS
@@ -14,7 +14,6 @@ cc [ \fIflag\fR... ] \fIfile\fR... \fB-lnvpair\fR [ \fIlibrary\fR... ]
 .fi
 
 .SH DESCRIPTION
-.sp
 .LP
 The \fBlibnvpair\fR library exports a set of functions for managing name-value
 pairs.
@@ -97,7 +96,6 @@ Pack an \fBnvlist_t\fR into a contiguous buffer.
 Expand a packed nvlist into a searchable \fBnvlist_t\fR.
 .RE
 .SH INTERFACES
-.sp
 .LP
 The shared object \fBlibnvpair.so.1\fR provides the public interfaces defined
 below. See \fBIntro\fR(3) for additional information on shared object
@@ -122,7 +120,8 @@ l l .
 \fBnvlist_add_uint16_array\fR	\fBnvlist_add_uint32\fR
 \fBnvlist_add_uint32_array\fR	\fBnvlist_add_uint64\fR
 \fBnvlist_add_uint64_array\fR	\fBnvlist_alloc\fR
-\fBnvlist_dup\fR	\fBnvlist_exists\fR
+\fBnvlist_dup\fR	\fBnvpair_empty\fR
+\fBnvlist_exists\fR
 \fBnvlist_free\fR	\fBnvlist_lookup_boolean\fR
 \fBnvlist_lookup_boolean_value\fR	\fBnvlist_lookup_boolean_array\fR
 \fBnvlist_lookup_byte\fR	\fBnvlist_lookup_byte_array\fR
@@ -162,7 +161,6 @@ l l .
 .TE
 
 .SH FILES
-.sp
 .ne 2
 .na
 \fB\fB/lib/libnvpair.so.1\fR\fR
@@ -181,7 +179,6 @@ shared object
 .RE
 
 .SH ATTRIBUTES
-.sp
 .LP
 See \fBattributes\fR(5) for description of the following attributes:
 .sp
@@ -199,6 +196,5 @@ MT-Level	MT-Safe
 .TE
 
 .SH SEE ALSO
-.sp
 .LP
 \fBIntro\fR(3), \fBattributes\fR(5)