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

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

1 files changed, 6 insertions, 15 deletions

diff --git a/usr/src/man/man3proc/ps_lgetregs.3proc b/usr/src/man/man3proc/ps_lgetregs.3proc
index d0ea42ec39..6f80838005 100644
--- a/usr/src/man/man3proc/ps_lgetregs.3proc
+++ b/usr/src/man/man3proc/ps_lgetregs.3proc
@@ -3,7 +3,7 @@
 .\" 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 ps_lgetregs 3PROC "30 Jan 1998" "SunOS 5.11" "Process Control Library Functions"
+.TH PS_LGETREGS 3PROC "Jan 30, 1998"
 .SH NAME
 ps_lgetregs, ps_lsetregs, ps_lgetfpregs, ps_lsetfpregs, ps_lgetxregsize,
 ps_lgetxregs, ps_lsetxregs \- routines that access the target process register
@@ -75,46 +75,38 @@ registers. \fBps_lgetxregs()\fR gets the extra state registers, and
 .SH RETURN VALUES
 .sp
 .ne 2
-.mk
 .na
 \fB\fBPS_OK\fR \fR
 .ad
 .RS 16n
-.rt  
 The call returned successfully.
 .RE
 
 .sp
 .ne 2
-.mk
 .na
 \fB\fBPS_NOFPREGS\fR \fR
 .ad
 .RS 16n
-.rt  
 Floating point registers are neither available for this architecture nor for
 this process.
 .RE
 
 .sp
 .ne 2
-.mk
 .na
 \fB\fBPS_NOXREGS\fR \fR
 .ad
 .RS 16n
-.rt  
 Extra state registers are not available on this architecture.
 .RE
 
 .sp
 .ne 2
-.mk
 .na
 \fB\fBPS_ERR\fR \fR
 .ad
 .RS 16n
-.rt  
 The function did not return successfully.
 .RE
 
@@ -126,13 +118,12 @@ See \fBattributes\fR(5) for description 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
 _
-MT LevelSafe
+MT Level	Safe
 .TE
 
 .SH SEE ALSO