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

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

1 files changed, 17 insertions, 22 deletions

diff --git a/usr/src/man/man3perl/Exacct::Object::Item.3perl b/usr/src/man/man3perl/Exacct::Object::Item.3perl
index 4099e7660c..2372acd484 100644
--- a/usr/src/man/man3perl/Exacct::Object::Item.3perl
+++ b/usr/src/man/man3perl/Exacct::Object::Item.3perl
@@ -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 Exacct::Object::Item 3PERL "1 Dec 2002" "SunOS 5.11" "Perl Library Functions"
+.TH EXACCT::OBJECT::ITEM 3PERL "Dec 1, 2002"
 .SH NAME
 Exacct::Object::Item \- exacct item manipulation
 .SH SYNOPSIS
@@ -26,19 +26,17 @@ types are mapped onto Perl types as follows:
 
 .sp
 .TS
-tab();
-cw(2.75i) cw(2.75i) 
-lw(2.75i) lw(2.75i) 
-.
-libexacct typePerl internal type
-\fBEXT_UINT8\fRIV (integer)
-\fBEXT_UINT16\fRIV (integer)
-\fBEXT_UINT32\fRIV (integer)
-\fBEXT_UINT64\fRIV (integer)
-\fBEXT_DOUBLE\fRNV (double)
-\fBEXT_STRING\fRPV (string)
-\fBEXT_RAW\fRPV (string)
-\fBEXT_EXACCT_OBJECT\fR\fBSun::Solaris::Exacct::Object subclass\fR
+c c
+l l .
+libexacct type	Perl internal type
+\fBEXT_UINT8\fR	IV (integer)
+\fBEXT_UINT16\fR	IV (integer)
+\fBEXT_UINT32\fR	IV (integer)
+\fBEXT_UINT64\fR	IV (integer)
+\fBEXT_DOUBLE\fR	NV (double)
+\fBEXT_STRING\fR	PV (string)
+\fBEXT_RAW\fR	PV (string)
+\fBEXT_EXACCT_OBJECT\fR	\fBSun::Solaris::Exacct::Object subclass\fR
 .TE
 
 .SS "Constants"
@@ -56,12 +54,10 @@ Class methods include those inherited from the
 \fBSun::Solaris::Exacct::Object\fR base class, plus the following:
 .sp
 .ne 2
-.mk
 .na
 \fB\fBnew($catalog, $value)\fR\fR
 .ad
 .RS 25n
-.rt  
 This method creates and returns a new \fBSun::Solaris::Exacct::Object::Item\fR.
 The catalog tag can be either an integer or a
 \fBSun::Solaris::Exacct::Catalog\fR. This catalog tag controls the conversion
@@ -91,13 +87,12 @@ 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 StabilityEvolving
+Interface Stability	Evolving
 .TE
 
 .SH SEE ALSO