[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, 14 deletions

diff --git a/usr/src/man/man3picltree/libpicltree.3picltree b/usr/src/man/man3picltree/libpicltree.3picltree
index 2651d0d63d..3732c1a259 100644
--- a/usr/src/man/man3picltree/libpicltree.3picltree
+++ b/usr/src/man/man3picltree/libpicltree.3picltree
@@ -3,19 +3,16 @@
 .\" 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 LIBPICLTREE 3PICLTREE "Mar 1, 2004"
+.TH LIBPICLTREE 3PICLTREE "May 16, 2020"
 .SH NAME
 libpicltree \- PTree and Plug-in Registration interface library
 .SH SYNOPSIS
-.LP
 .nf
 \fBcc\fR [\fIflag \&.\|.\|.\fR] \fIfile \fR\&.\|.\|. \fB-lpicltree\fR [\fIlibrary \&.\|.\|.\fR]
 #include <picltree.h>
 .fi
 
 .SH DESCRIPTION
-.sp
-.LP
 The PTree interface is the set of functions and data structures to access and
 manipulate the PICL tree. The daemon and the plug-in modules use the PTree
 interface.
@@ -53,8 +50,6 @@ properties.
 The maximum size of a property value cannot exceed \fBPICL_PROPSIZE_MAX\fR.  It
 is currently set to 512KB.
 .SS "Volatile Properties"
-.sp
-.LP
 In addition to \fBPICL_READ\fR and \fBPICL_WRITE\fR property access modes, the
 plug-in modules specify whether a property is volatile or not by setting the
 bit \fBPICL_VOLATILE\fR.
@@ -142,11 +137,9 @@ the maximum possible size of the value. The maximum size of the value cannot
 exceed \fBPICL_PROPSIZE_MAX\fR. This allows a client to allocate a sufficiently
 large buffer before retrieving a volatile property's value
 .SS "Plug-in Modules"
-.sp
-.LP
 Plug-in modules are shared objects that are located in well-known directories
-for the daemon to locate and load them. Plug-in module's are located in the one
-of the following plug-in directories depending on the plaform-specific nature
+for the daemon to locate and load them. Plug-in modules are located in the one
+of the following plug-in directories depending on the platform-specific nature
 of the data they collect and publish.
 .sp
 .in +2
@@ -171,8 +164,6 @@ registration.
 The plug-in modules may use the \fBpicld_log\fR(3PICLTREE) function to log
 their messages to the system log file.
 .SH ATTRIBUTES
-.sp
-.LP
 See \fBattributes\fR(5) for descriptions of the following attributes:
 .sp
 
@@ -187,7 +178,5 @@ MT-Level	MT-Safe
 .TE
 
 .SH SEE ALSO
-.sp
-.LP
 \fBlibpicl\fR(3PICL), \fBlibpicltree\fR(3LIB), \fBpicld_log\fR(3PICLTREE),
 \fBpicld_plugin_register\fR(3PICLTREE), \fBattributes\fR(5)