[illumos-gate merge]

commit ac4f20c056d4e5beb8b62e2c843802e3298be389
    11484 usr/src/cmd/ypcmd/ypupdated.c is unused
commit 275a2dc2ef933b7b810b98855f8ee3fa0e662007
    11483 usr/src/cmd/spell/malloc.c is unused
commit a25df66779f8c4c58005d492d3ceac6312116360
    11364 Want system event for datalink state changes
    11365 Want ability to toggle etherstub link state
commit 78d23b23ae6c0e2213934bf6698f8447eee94b2e
    11396 ndmpd: NULL pointer errors
commit c77bf7778622780cbb6cd7b4e39f428948e33280
    11391 keyserv: NULL pointer errors
commit b89e8170ec8d28d026b67ad7ce606c02a83398dc
    11390 krb5: NULL pointer errors

	Conflicts:
	usr/src/uts/common/sys/sysevent/datalink.h
	usr/src/uts/common/sys/sysevent.h
	usr/src/uts/common/io/dls/dls_mgmt.c
	usr/src/uts/common/io/dls/dls_link.c

1 files changed, 8 insertions, 7 deletions

diff --git a/usr/src/man/man3lib/libsysevent.3lib b/usr/src/man/man3lib/libsysevent.3lib
index 579e01b25b..4a932e5a62 100644
--- a/usr/src/man/man3lib/libsysevent.3lib
+++ b/usr/src/man/man3lib/libsysevent.3lib
@@ -1,9 +1,10 @@
 '\" te
 .\" Copyright (c) 2007, Sun Microsystems, Inc. All Rights Reserved.
+.\" Copyright 2019 Joyent, Inc.
 .\" 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 LIBSYSEVENT 3LIB "Jan 21, 2014"
+.TH LIBSYSEVENT 3LIB "July 15, 2019"
 .SH NAME
 libsysevent \- system event interface library
 .SH SYNOPSIS
@@ -14,7 +15,6 @@ cc [ \fIflag\fR... ] \fIfile\fR... \fB-lsysevent\fR [ \fIlibrary\fR... ]
 .fi
 
 .SH DESCRIPTION
-.sp
 .LP
 Functions in this library extract specific identifier, publisher, and attribute
 information from a system event (sysevent) handle, defined as \fBsysevent_t\fR,
@@ -23,9 +23,13 @@ delivery to the system event daemon, \fBsyseventd\fR(1M).
 .sp
 .LP
 The \fBlibsysevent\fR interfaces do not work at all in non-global zones.
-.SH INTERFACES
 .sp
 .LP
+For a list of events, please see \fBsysevents\fR(3SYSEVENT). The actual
+events and their payload, unlike the library interfaces, are considered
+private to the system and subject to change at any time.
+.SH INTERFACES
+.LP
 The shared object \fBlibsysevent.so.1\fR provides the public interfaces defined
 below. See \fBIntro\fR(3) for additional information on shared object
 interfaces.
@@ -42,11 +46,10 @@ l l .
 \fBsysevent_get_subclass_name\fR	\fBsysevent_get_time\fR
 \fBsysevent_get_vendor_name\fR	\fBsysevent_post_event\fR
 \fBsysevent_subscribe_event\fR	\fBsysevent_unbind_handle\fR
-\fBsysevent_unsubscribe_event\fR	
+\fBsysevent_unsubscribe_event\fR
 .TE
 
 .SH FILES
-.sp
 .ne 2
 .na
 \fB\fB/usr/lib/libsysevent.so.1\fR \fR
@@ -67,7 +70,6 @@ shared object
 .RE
 
 .SH ATTRIBUTES
-.sp
 .LP
 See \fBattributes\fR(5) for descriptions of the following attributes:
 .sp
@@ -85,6 +87,5 @@ MT-Level	MT-Safe
 .TE
 
 .SH SEE ALSO
-.sp
 .LP
 \fBsyseventd\fR(1M), \fBIntro\fR(3), \fBattributes\fR(5)