diff options
| author | Jerry Jelinek <jerry.jelinek@joyent.com> | 2020-06-03 11:38:44 +0000 |
|---|---|---|
| committer | Jerry Jelinek <jerry.jelinek@joyent.com> | 2020-06-03 11:38:44 +0000 |
| commit | 1c5ac86169ba0e28b070d8b7f6c787be64bce7e4 (patch) | |
| tree | 984f229706437e50b866d25cd3aced33f9358a5f /usr/src/pkg/manifests/system-library.man3scf.inc | |
| parent | ed13e9ae4cee8abfe808486d0e0d7ee69b8fc256 (diff) | |
| parent | d15d17d4231f87f1571fa6d585377206f360f667 (diff) | |
| download | illumos-joyent-1c5ac86169ba0e28b070d8b7f6c787be64bce7e4.tar.gz | |
[illumos-gate merge]
commit d15d17d4231f87f1571fa6d585377206f360f667
12786 fix CTF pointer overrun
commit 8fff788790878e3c95666decd46960ecc74c1c69
12721 would like svcadm disable -c
commit 87be0d9605ee884229638b6fd168fa7165e109a3
12813 pptadm and libppt are x86 only
commit 069e6b7e31ba5dcbc5441b98af272714d9a5455c
12708 Packages could be linted
12717 Stop ignoring pkgdepend errors
commit 605d010da59abaf92279a7caed83515cbb3218dc
7510 enable highres clock usage for non-privileged users
Conflicts:
usr/src/man/man3c/timer_settime.3c
Diffstat (limited to 'usr/src/pkg/manifests/system-library.man3scf.inc')
| -rw-r--r-- | usr/src/pkg/manifests/system-library.man3scf.inc | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/usr/src/pkg/manifests/system-library.man3scf.inc b/usr/src/pkg/manifests/system-library.man3scf.inc index d26af9e51b..7d8c7380cd 100644 --- a/usr/src/pkg/manifests/system-library.man3scf.inc +++ b/usr/src/pkg/manifests/system-library.man3scf.inc @@ -12,6 +12,7 @@ # # Copyright 2011, Richard Lowe # Copyright 2012 Nexenta Systems, Inc. All rights reserved. +# Copyright 2020 Joyent, Inc. # file path=usr/share/man/man3scf/scf_entry_create.3scf @@ -425,6 +426,8 @@ link path=usr/share/man/man3scf/smf_degrade_instance.3scf \ target=smf_enable_instance.3scf link path=usr/share/man/man3scf/smf_disable_instance.3scf \ target=smf_enable_instance.3scf +link path=usr/share/man/man3scf/smf_disable_instance_with_comment.3scf \ + target=smf_enable_instance.3scf link path=usr/share/man/man3scf/smf_get_state.3scf \ target=smf_enable_instance.3scf link path=usr/share/man/man3scf/smf_maintain_instance.3scf \ |