[illumos-gate merge]

commit d0b89bad7e1fdc02b67434ccc5d1c0e983e25583
    12743 man page spelling mistakes
commit 7e95e8d94bf4ccccc742a5e7a1370afe0d890ae3
    12728 emlxs: symbol 'emlxs_prog_type_t' is multiply-defined
commit bd025ac2b6fbfbc59dfc0bd50a0e56dd56de9229
    12739 gld module missing dep on mac after 12671
commit 4c87aefe8930bd07275b8dd2e96ea5f24d93a52e
    12665 want modern bhyve
commit a68aefedafdc78f1f25e9c888f61357d59c87311
    12540 mdb: build with gcore

	Conflicts:
	exception_lists/check_rtime
	exception_lists/copyright
	exception_lists/cstyle
	exception_lists/hdrchk
	exception_lists/packaging
	exception_lists/wscheck
	usr/src/cmd/bhyve/Makefile
	usr/src/cmd/bhyve/acpi.c
	usr/src/cmd/bhyve/bhyverun.c
	usr/src/cmd/bhyve/block_if.c
	usr/src/cmd/bhyve/gdb.c
	usr/src/cmd/bhyve/mevent.c
	usr/src/cmd/bhyve/pci_e82545.c
	usr/src/cmd/bhyve/pci_emul.c
	usr/src/cmd/bhyve/pci_emul.h
	usr/src/cmd/bhyve/pci_fbuf.c
	usr/src/cmd/bhyve/pci_nvme.c
	usr/src/cmd/bhyve/pci_passthru.c
	usr/src/cmd/bhyve/pci_virtio_block.c
	usr/src/cmd/bhyve/pci_virtio_console.c
	usr/src/cmd/bhyve/pci_virtio_net.c
	usr/src/cmd/bhyve/pci_virtio_scsi.c
	usr/src/cmd/bhyve/pci_virtio_viona.c
	usr/src/cmd/bhyve/pci_xhci.c
	usr/src/cmd/bhyve/rfb.c
	usr/src/cmd/bhyve/test/Makefile.com
	usr/src/cmd/bhyve/test/tst/mevent/lists.delete.c
	usr/src/cmd/bhyve/test/tst/mevent/testlib.c
	usr/src/cmd/bhyve/test/tst/mevent/testlib.h
	usr/src/cmd/bhyve/uart_emul.c
	usr/src/cmd/bhyve/virtio.c
	usr/src/cmd/bhyve/virtio.h
	usr/src/cmd/bhyvectl/Makefile
	usr/src/cmd/bhyvectl/bhyvectl.c
	usr/src/cmd/devfsadm/i386/misc_link_i386.c
	usr/src/compat/freebsd/amd64/machine/specialreg.h
	usr/src/compat/freebsd/sys/callout.h
	usr/src/compat/freebsd/sys/param.h
	usr/src/lib/Makefile
	usr/src/lib/libvmmapi/common/mapfile-vers
	usr/src/lib/libvmmapi/common/vmmapi.c
	usr/src/lib/libvmmapi/common/vmmapi.h
	usr/src/pkg/manifests/system-bhyve.mf
	usr/src/pkg/manifests/system-library-bhyve.mf
	usr/src/uts/i86pc/Makefile.files
	usr/src/uts/i86pc/io/vmm/README.sync
	usr/src/uts/i86pc/io/vmm/amd/svm.c
	usr/src/uts/i86pc/io/vmm/intel/vmx.c
	usr/src/uts/i86pc/io/vmm/intel/vtd.c
	usr/src/uts/i86pc/io/vmm/io/ppt.h
	usr/src/uts/i86pc/io/vmm/io/vatpit.c
	usr/src/uts/i86pc/io/vmm/io/vlapic.c
	usr/src/uts/i86pc/io/vmm/vm/vm_map.h
	usr/src/uts/i86pc/io/vmm/vm/vm_page.h
	usr/src/uts/i86pc/io/vmm/vmm.c
	usr/src/uts/i86pc/io/vmm/vmm_host.h
	usr/src/uts/i86pc/io/vmm/vmm_instruction_emul.c
	usr/src/uts/i86pc/io/vmm/vmm_sol_dev.c
	usr/src/uts/i86pc/io/vmm/vmm_sol_glue.c
	usr/src/uts/i86pc/io/vmm/vmm_sol_vm.c
	usr/src/uts/i86pc/sys/viona_io.h
	usr/src/uts/i86pc/sys/vmm.h
	usr/src/uts/i86pc/sys/vmm_dev.h
	usr/src/uts/i86pc/sys/vmm_drv.h
	usr/src/uts/i86pc/viona/Makefile
	usr/src/uts/i86pc/vmm/Makefile

1 files changed, 3 insertions, 6 deletions

diff --git a/usr/src/man/man4/ippool.4 b/usr/src/man/man4/ippool.4
index d70b5cad9a..1b6586a4b0 100644
--- a/usr/src/man/man4/ippool.4
+++ b/usr/src/man/man4/ippool.4
@@ -1,10 +1,10 @@
 '\" te
 .\" To view license terms, attribution, and copyright for IP Filter, the
-.\" default path is /usr/lib/ipf/IPFILTER.LICENCE. If the Illumos operating
+.\" default path is /usr/lib/ipf/IPFILTER.LICENCE. If the illumos operating
 .\" environment has been installed anywhere other than the default, modify the
 .\" given path to access the file at the installed location.
 .\" Portions Copyright (c) 2015, Joyent, Inc.
-.TH IPPOOL 4 "April 9, 2016"
+.TH IPPOOL 4 "May 16, 2020"
 .SH NAME
 ippool, ippool.conf \- IP Pool file format
 .SH DESCRIPTION
@@ -62,7 +62,6 @@ of a mixture of netmask sizes, from 0 to 32.
 .PP
 At this point in time, only IPv4 addressing is supported.
 .SH OVERVIEW
-.PP
 The IP pool configuration file provides for defining two different mechanisms
 for improving speed in matching IP addresses with rules.
 The first,
@@ -86,7 +85,6 @@ or
 respectively, for determining which filter group to jump to next for
 continuation of filter packet processing.
 .SH POOL TYPES
-.PP
 Two storage formats are provided: hash tables and tree structure.  The hash
 table is intended for use with objects all containing the same netmask or a
 few different sized netmasks of non-overlapping address space and the tree
@@ -96,8 +94,7 @@ to use the tree data storage type with
 .B group-map
 configuration entries.
 .SH POOL ROLES
-.PP
-When a pool is defined in the configruation file, it must have an associated
+When a pool is defined in the configuration file, it must have an associated
 role.  At present the only supported role is
 .B ipf.
 Future development will see further expansion of their use by other sections