[illumos-gate merge]

commit e58ba7f235f59e7b79c7d4ce4fb02b7adc47273e
    12074 loader: cd9660_open() warn: is 'buf' large enough for 'struct iso_primary_descriptor'?
commit 8047359fa9aaaf6af13c81ce125afa018449661d
    12071 clarify implementation of single_instance in SMF services
commit 55622ceb9a02ebd6f006f047a2447f46c605bb4a
    11987 libevent: cast between incompatible function types
commit 3665ce8aeee26b1a84fb98951ef011e0779e1ae2
    11978 libnsl: cast between incompatible function types
commit 1593262046299386a3cb4f951daa90d15acdfe6c
    11983 libsocket: alias between functions of incompatible types
commit fb79d5292b21ee64c248cf81a28a07cb84b18ba1
    11980 libc_db: 'td_sync_setstate' alias between functions of incompatible types
commit 6fd7fa3508e1106878910ac25711ec6960715489
    11055 loader: zfs reader cstyle cleanup

	Conflicts:
	usr/src/man/man1m/svc.startd.1m
	usr/src/cmd/svc/milestone/network-physical.xml

1 files changed, 4 insertions, 10 deletions

diff --git a/usr/src/man/man5/smf_restarter.5 b/usr/src/man/man5/smf_restarter.5
index 4f17933450..5ca1b5b729 100644
--- a/usr/src/man/man5/smf_restarter.5
+++ b/usr/src/man/man5/smf_restarter.5
@@ -1,14 +1,13 @@
 '\" te
 .\" Copyright (c) 2008, 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 SMF_RESTARTER 5 "May 23, 2008"
+.TH SMF_RESTARTER 5 "Dec 11, 2019"
 .SH NAME
 smf_restarter \- service management facility conventions for restarters
 .SH DESCRIPTION
-.sp
-.LP
 All service instances in the service management facility must be managed by a
 restarter. This manual page describes configuration, functionality, and
 reporting characteristics that are common to all restarters in the framework.
@@ -21,8 +20,6 @@ service instance to determine configuration. The restarter manages a set of
 property groups to communicate the current disposition of a service with
 display tools such as \fBsvcs\fR(1).
 .SS "Service Configuration"
-.sp
-.LP
 The common restarter configuration for all services is captured in the
 \fBgeneral\fR property group. This group includes the following required and
 optional property settings.
@@ -54,12 +51,11 @@ absent, the restarter defaults to \fBsvc.startd\fR(1M).
 .ad
 .RS 19n
 This is an optional property. When set, only one instance of the service is
-allowed to transition to an online or degraded status at any time.
+allowed to transition to an online or degraded status at any time. Note that no
+known implementation honours this setting, and it should be considered obsolete.
 .RE
 
 .SS "Service Reporting"
-.sp
-.LP
 All restarters report status using the \fBrestarter\fR property group, which
 includes the following properties:
 .sp
@@ -106,7 +102,5 @@ executing.
 .RE
 
 .SH SEE ALSO
-.sp
-.LP
 \fBsvcs\fR(1), \fBsvc.startd\fR(1M), \fBservice_bundle\fR(4), \fBsmf\fR(5),
 \fBsmf_method\fR(5)