[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

2 files changed, 0 insertions, 17 deletions

diff --git a/usr/src/man/man3c/timer_create.3c b/usr/src/man/man3c/timer_create.3c
index 08b8351755..63b57e0a41 100644
--- a/usr/src/man/man3c/timer_create.3c
+++ b/usr/src/man/man3c/timer_create.3c
@@ -48,7 +48,6 @@
 .SH NAME
 timer_create \- create a timer
 .SH SYNOPSIS
-.LP
 .nf
 #include <signal.h>
 #include <time.h>
@@ -58,7 +57,6 @@ timer_create \- create a timer
 .fi
 
 .SH DESCRIPTION
-.LP
 The \fBtimer_create()\fR function creates a timer using the specified clock,
 \fIclock_id\fR, as the timing base. The \fBtimer_create()\fR function returns,
 in the location referenced by \fItimerid\fR, a timer \fBID\fR of type
@@ -131,14 +129,12 @@ Timers are not inherited by a child process across a \fBfork\fR(2) and are
 disarmed and deleted by a call to one of the \fBexec\fR functions (see
 \fBexec\fR(2)).
 .SH RETURN VALUES
-.LP
 Upon successful completion, \fBtimer_create()\fR returns \fB0\fR and updates
 the location referenced by \fItimerid\fR to a \fBtimer_t\fR, which can be
 passed to the per-process timer calls. If an error occurs, the function returns
 \fB\(mi1\fR and sets \fBerrno\fR to indicate the error. The value of
 \fItimerid\fR is undefined if an error occurs.
 .SH ERRORS
-.LP
 The \fBtimer_create()\fR function will fail if:
 .sp
 .ne 2
@@ -161,7 +157,6 @@ The specified clock \fBID\fR, \fIclock_id\fR, is not defined.
 .RE
 
 .SH ATTRIBUTES
-.LP
 See \fBattributes\fR(5) for descriptions of the following attributes:
 .sp
 
@@ -180,7 +175,6 @@ Standard	See \fBstandards\fR(5).
 .TE
 
 .SH SEE ALSO
-.LP
 \fBexec\fR(2), \fBfork\fR(2), \fBtime\fR(2), \fBclock_settime\fR(3C),
 \fBsignal\fR(3C), \fBsignal.h\fR(3HEAD), \fBtimer_delete\fR(3C),
 \fBtimer_settime\fR(3C), \fBattributes\fR(5), \fBstandards\fR(5)
diff --git a/usr/src/man/man3c/timer_settime.3c b/usr/src/man/man3c/timer_settime.3c
index ca07bfdb63..3813a9d86d 100644
--- a/usr/src/man/man3c/timer_settime.3c
+++ b/usr/src/man/man3c/timer_settime.3c
@@ -49,7 +49,6 @@
 .SH NAME
 timer_settime, timer_gettime, timer_getoverrun \- per-process timers
 .SH SYNOPSIS
-.LP
 .nf
 #include <time.h>
 
@@ -69,8 +68,6 @@ timer_settime, timer_gettime, timer_getoverrun \- per-process timers
 .fi
 
 .SH DESCRIPTION
-.sp
-.LP
 The \fBtimer_settime()\fR function sets the time until the next expiration of
 the timer specified by \fItimerid\fR from the \fBit_value\fR member of the
 \fIvalue\fR argument and arm the timer if the \fBit_value\fR member of
@@ -146,16 +143,12 @@ smaller than a system defined threshold, then {\fBPRIV_PROC_CLOCK_HIGHRES\fR}
 must be asserted in the effective set of the calling process or the time values
 will be adjusted up to the threshold value.
 .SH RETURN VALUES
-.sp
-.LP
 If the \fBtimer_settime()\fR or \fBtimer_gettime()\fR functions succeed,
 \fB0\fR is returned. If an error occurs for either of these functions,
 \fB\(mi1\fR is returned, and \fBerrno\fR is set to indicate the error. If the
 \fBtimer_getoverrun()\fR function succeeds, it returns the timer expiration
 overrun count as explained above.
 .SH ERRORS
-.sp
-.LP
 The \fBtimer_settime()\fR, \fBtimer_gettime()\fR and \fBtimer_getoverrun()\fR
 functions will fail if:
 .sp
@@ -190,8 +183,6 @@ than or equal to 1000 million.
 .RE
 
 .SH ATTRIBUTES
-.sp
-.LP
 See \fBattributes\fR(5) for descriptions of the following attributes:
 .sp
 
@@ -210,8 +201,6 @@ Standard	See \fBstandards\fR(5).
 .TE
 
 .SH SEE ALSO
-.sp
-.LP
 \fBtime.h\fR(3HEAD), \fBclock_settime\fR(3C), \fBtimer_create\fR(3C),
 \fBtimer_delete\fR(3C), \fBattributes\fR(5), \fBprivileges\fR(5),
 \fBstandards\fR(5)