[illumos-gate merge]

commit 7ab4e62e3b5c454f248a38bec0d489e8f5543324
    3346 svc-hostid uses perl stupidly
commit 95c635efb7c3b86efc493e0447eaec7aecca3f0f
    5025 import and use mandoc
commit 81d43577d1b5e76e6016ba642ecc1a76fde43021
    5004 load average should be virtualized for zones
commit 944b13ecd074fe0d43ed6f80c816ca862c3cd6eb
    4956 zonecfg won't use a valid pager
commit e03914f9208eb53e6c8a6d5a436953ad983642b0
    4696 allowed-ips should let you specify prefixes
commit 31c6d826a7f7a4ee7d83c8e99f25d82a4a248076
    4922 all calloc() implementations should check for overflow
commit d9c5840bd764434fd93f85a52eb4cbc24bff03da
    4959 completely discarded merged string sections will corrupt output objects
commit 2e4c998613148111f2fc5371085331ffb39122ff
    4976 zfs should only avoid writing to a failing non-redundant top-level vdev
    4977 mdb error in ::spa_space from space_cb() if a metaslab's ms_sm is NULL
    4978 ztest fails in get_metaslab_refcount()
    4979 extend free space histogram to device and pool
    4980 metaslabs should have a fragmentation metric
    4981 remove fragmented ops vector from block allocator
    4982 space_map object should proactively upgrade when feature is enabled
    4983 need to collect metaslab information via mdb
    4984 device selection should use fragmentation metric
commit 1a41ca239310955ae95b2569b707432432a58580
    5013 add support for multiple mac addresses per client
commit 680047a5d0ef56480110f0de516145ba0efd5caa
    474 tcp_strong_iss should be 2 instead of 1 (missing file)
commit 6400a6be1817a40f3dbefdd3df7b7d87bcebef30
    474 tcp_strong_iss should be 2 instead of 1
commit dcb12fb726d8dd4ff80ea255dc3f53b5692c75e5
    5014 etherstubs confuse min mtu with min sdu
commit c9030f6c93613fe30ee0c16f92b96da7816ac052
    5008 lock contention (rrw_exit) while running a read only load

Conflicts:
	usr/src/uts/common/sys/zone.h
	usr/src/uts/common/sys/vnic_impl.h
	usr/src/uts/common/sys/mac.h
	usr/src/uts/common/os/zone.c
	usr/src/uts/common/io/vnic/vnic_dev.c
	usr/src/uts/common/io/mac/mac_protect.c
	usr/src/uts/common/io/mac/mac_client.c
	usr/src/tools/scripts/git-pbchk.py
	usr/src/tools/onbld/hgext/cdm.py
	usr/src/test/util-tests/tests/Makefile
	usr/src/pkg/manifests/developer-build-onbld.mf
	usr/src/man/man5/Makefile
	usr/src/lib/libdladm/common/linkprop.c
	usr/src/cmd/zonecfg/zonecfg.c
	usr/src/cmd/Makefile
	usr/src/man/man1/column.1
	usr/src/man/man1/crontab.1
	usr/src/man/man1m/dladm.1m
	usr/src/man/man1m/flowadm.1m
	usr/src/man/man1m/snoop.1m
	usr/src/man/man1m/vfsstat.1m
	usr/src/man/man1m/vndadm.1m
	usr/src/man/man1m/zfs.1m
	usr/src/man/man1m/zonecfg.1m
	usr/src/man/man1m/zpool.1m
	usr/src/man/man3c/epoll_create.3c
	usr/src/man/man3c/epoll_ctl.3c
	usr/src/man/man3c/epoll_wait.3c
	usr/src/man/man3lib/libvnd.3lib
	usr/src/man/man3vnd/vnd_frameio_read.3vnd
	usr/src/man/man3vnd/vnd_prop_get.3vnd
	usr/src/man/man3vnd/vnd_prop_iter.3vnd
	usr/src/man/man3vnd/vnd_walk.3vnd
	usr/src/man/man5/epoll.5
	usr/src/man/man7d/vnd.7d
	usr/src/man/man7fs/bootfs.7fs
	usr/src/man/man7fs/lxproc.7fs

Manifests:
	usr/src/pkg/manifests/text-doctools.mf
	usr/src/pkg/manifests/system-man.mf

4 files changed, 8 insertions, 9 deletions

diff --git a/usr/src/man/man3vnd/vnd_frameio_read.3vnd b/usr/src/man/man3vnd/vnd_frameio_read.3vnd
index df317c7cf3..5fc65c96a3 100644
--- a/usr/src/man/man3vnd/vnd_frameio_read.3vnd
+++ b/usr/src/man/man3vnd/vnd_frameio_read.3vnd
@@ -46,7 +46,7 @@ with readv(2) and writev(2).
 vnd_frameio_read performs a framed I/O read of the device represented by
 the handle vhp, with the framed I/O data described by fiop.
 vnd_frameio_write works in the same manner, except performing a write
-instead of a read. 
+instead of a read.
 
 .LP
 The basic vector component of the frameio_t is the framevec_t. Each
@@ -548,7 +548,7 @@ main(void)
 	/* Do proper memory cleanup */
 	return (0);
 }
-.nf
+.fi
 .in -2
 
 .LP
diff --git a/usr/src/man/man3vnd/vnd_prop_get.3vnd b/usr/src/man/man3vnd/vnd_prop_get.3vnd
index 4170a4aca5..e47698c85e 100644
--- a/usr/src/man/man3vnd/vnd_prop_get.3vnd
+++ b/usr/src/man/man3vnd/vnd_prop_get.3vnd
@@ -44,21 +44,21 @@ libvnd(3LIB) manual page.
 
 
 .SH RETURN VALUES
-.LP 
+.LP
 On success, the vnd_prop_get and vnd_prop_set functions return zero.
 On failure, they return -1 and additional error information is
 available through vnd_errno(3VND) and vnd_syserrno(3VND).
 
-.LP 
+.LP
 When vnd_prop_get returns successfully, the contents of buf are
 filled in with the value of the corresponding property. The contents
 of buf should not change across a call to vnd_prop_set.
 
 .SH EXAMPLES
 
-.LP 
+.LP
 Example 1   Getting the value of the rxbuf property
-.LP 
+.LP
 The following sample C program retrieves the value of the
 rxbuf property and prints it to standard out.
 
@@ -219,7 +219,6 @@ main(void)
 	vnd_close(vnd);
 	return (0);
 }
-.nf
 .fi
 
 .SH ATTRIBUTES
diff --git a/usr/src/man/man3vnd/vnd_prop_iter.3vnd b/usr/src/man/man3vnd/vnd_prop_iter.3vnd
index 18485950cf..29221734c5 100644
--- a/usr/src/man/man3vnd/vnd_prop_iter.3vnd
+++ b/usr/src/man/man3vnd/vnd_prop_iter.3vnd
@@ -63,7 +63,7 @@ instead return one. In the case of library failure, vnd_prop_iter will
 return -1. In such cases, the vnd and system errors will be updated
 and available via vnd_errno(3VND) and vnd_syserrno(3VND).
 
-.SHEXAMPLES
+.SH EXAMPLES
 
 .LP
 Example 1    Print writeable properties
diff --git a/usr/src/man/man3vnd/vnd_walk.3vnd b/usr/src/man/man3vnd/vnd_walk.3vnd
index 0c7197f656..bed53130d3 100644
--- a/usr/src/man/man3vnd/vnd_walk.3vnd
+++ b/usr/src/man/man3vnd/vnd_walk.3vnd
@@ -87,7 +87,7 @@ top of.
 .LP
 The vnd_walk function will return zero on success. If the consumer
 supplied callback function returned non-zero, then the vnd_walk
-function will return 1. If an error occurred, -1 is returned, and if 
+function will return 1. If an error occurred, -1 is returned, and if
 vnderr and syserr are non-null, they are filled in with their
 respective error values. See vnd_errno(3VND) for more information on
 these errors.