Merge branch 'master' of http://github.com/illumos/illumos-gate into gcc/upgrade

Conflicts:
	usr/src/cmd/avs/dsw/iiadm.c

1 files changed, 7 insertions, 18 deletions

diff --git a/usr/src/man/man2/getitimer.2 b/usr/src/man/man2/getitimer.2
index b21f0b8005..b9acb8e12a 100644
--- a/usr/src/man/man2/getitimer.2
+++ b/usr/src/man/man2/getitimer.2
@@ -2,7 +2,7 @@
 .\" Copyright (c) 2009 Sun Microsystems, Inc. All Rights Reserved.
 .\" Copyright 1989 AT&T
 .\" Copyright (c) 1983 Regents of the University of California.  All rights reserved.  The Berkeley software License Agreement  specifies the terms and conditions for redistribution.
-.TH getitimer 2 "15 Jun 2009" "SunOS 5.11" "System Calls"
+.TH GETITIMER 2 "Jun 15, 2009"
 .SH NAME
 getitimer, setitimer \- get or set value of interval timer
 .SH SYNOPSIS
@@ -58,24 +58,20 @@ values are rounded up to the resolution of the profiling clock. The four timers
 are as follows:
 .sp
 .ne 2
-.mk
 .na
 \fB\fBITIMER_REAL\fR\fR
 .ad
 .RS 19n
-.rt  
 Decrements in real time.  A \fBSIGALRM\fR signal is delivered to the process
 when this timer expires.
 .RE
 
 .sp
 .ne 2
-.mk
 .na
 \fB\fBITIMER_VIRTUAL\fR\fR
 .ad
 .RS 19n
-.rt  
 Decrements in lightweight process (lwp) virtual time. It runs only when the
 calling lwp is executing. A \fBSIGVTALRM\fR signal is delivered to the calling
 lwp when it expires.
@@ -83,12 +79,10 @@ lwp when it expires.
 
 .sp
 .ne 2
-.mk
 .na
 \fB\fBITIMER_PROF\fR\fR
 .ad
 .RS 19n
-.rt  
 Decrements both in lightweight process (lwp) virtual time and when the system
 is running on behalf of the lwp.  It is designed to be used by interpreters in
 statistically profiling the execution of interpreted programs. Each time the
@@ -99,12 +93,10 @@ using this timer must be prepared to restart interrupted functions.
 
 .sp
 .ne 2
-.mk
 .na
 \fB\fBITIMER_REALPROF\fR\fR
 .ad
 .RS 19n
-.rt  
 Decrements in real time. It is designed to be used for real-time profiling of
 multithreaded programs. Each time the \fBITIMER_REALPROF\fR timer expires, one
 counter in a set of counters maintained by the system for each lightweight
@@ -148,12 +140,10 @@ returned and \fBerrno\fR is set to indicate the error.
 The \fBgetitimer()\fR and \fBsetitimer()\fR functions will fail if:
 .sp
 .ne 2
-.mk
 .na
 \fB\fBEINVAL\fR\fR
 .ad
 .RS 10n
-.rt  
 The specified number of seconds is greater than 100,000,000, the number of
 microseconds is greater than or equal to 1,000,000, or the \fIwhich\fR argument
 is unrecognized.
@@ -167,15 +157,14 @@ See \fBattributes\fR(5) for descriptions of the following attributes:
 
 .sp
 .TS
-tab() box;
-cw(2.75i) |cw(2.75i) 
-lw(2.75i) |lw(2.75i) 
-.
-ATTRIBUTE TYPEATTRIBUTE VALUE
+box;
+c | c
+l | l .
+ATTRIBUTE TYPE	ATTRIBUTE VALUE
 _
-Interface StabilityStandard
+Interface Stability	Standard
 _
-MT-LevelMT-Safe
+MT-Level	MT-Safe
 .TE
 
 .SH SEE ALSO