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, 27 deletions

diff --git a/usr/src/man/man3perl/Project.3perl b/usr/src/man/man3perl/Project.3perl
index eac8f0080d..894f62f4b8 100644
--- a/usr/src/man/man3perl/Project.3perl
+++ b/usr/src/man/man3perl/Project.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 Project 3PERL "1 Dec 2002" "SunOS 5.11" "Perl Library Functions"
+.TH PROJECT 3PERL "Dec 1, 2002"
 .SH NAME
 Project \- Perl interface to Projects
 .SH SYNOPSIS
@@ -27,7 +27,6 @@ Project-related headers.
 .SS "Functions"
 .sp
 .ne 2
-.mk
 .na
 \fB\fBgetprojid()\fR\fR
 .ad
@@ -39,7 +38,6 @@ This function returns the numeric project ID of the calling process or
 
 .sp
 .ne 2
-.mk
 .na
 \fB\fBsetproject($project, $user, $flags)\fR\fR
 .ad
@@ -57,7 +55,6 @@ See \fBsetproject\fR(3PROJECT).
 
 .sp
 .ne 2
-.mk
 .na
 \fB\fBactiveprojects()\fR\fR
 .ad
@@ -69,7 +66,6 @@ Each value in the list is the numeric ID of a currently active project.
 
 .sp
 .ne 2
-.mk
 .na
 \fB\fBgetprojent()\fR\fR
 .ad
@@ -92,7 +88,6 @@ or project lists. On end-of-file \fBundef\fR is returned.
 
 .sp
 .ne 2
-.mk
 .na
 \fB\fBsetprojent()\fR\fR
 .ad
@@ -103,7 +98,6 @@ This function rewinds the project database to the beginning of the file.
 
 .sp
 .ne 2
-.mk
 .na
 \fB\fBendprojent()\fR\fR
 .ad
@@ -114,7 +108,6 @@ This function closes the project database.
 
 .sp
 .ne 2
-.mk
 .na
 \fB\fBgetprojbyname($name)\fR\fR
 .ad
@@ -127,7 +120,6 @@ is found and \fBundef\fR if it cannot be found.
 
 .sp
 .ne 2
-.mk
 .na
 \fB\fBgetprojbyid($id)\fR\fR
 .ad
@@ -140,7 +132,6 @@ found or \fBundef\fR if it cannot be found.
 
 .sp
 .ne 2
-.mk
 .na
 \fB\fBgetdefaultproj($user)\fR\fR
 .ad
@@ -154,7 +145,6 @@ process.
 
 .sp
 .ne 2
-.mk
 .na
 \fB\fBfgetprojent($filehandle)\fR\fR
 .ad
@@ -167,7 +157,6 @@ format.  Return values are the same as for \fBgetprojent()\fR.
 
 .sp
 .ne 2
-.mk
 .na
 \fB\fBinproj($user, $project)\fR\fR
 .ad
@@ -180,7 +169,6 @@ See \fBinproj\fR(3PROJECT).
 
 .sp
 .ne 2
-.mk
 .na
 \fB\fBgetprojidbyname($project)\fR\fR
 .ad
@@ -206,23 +194,19 @@ By default nothing is exported from this module. The following tags can be used
 to selectively import constants and functions defined in this module:
 .sp
 .ne 2
-.mk
 .na
 \fB\fB:SYSCALLS\fR\fR
 .ad
 .RS 14n
-.rt  
 \fBgetprojid()\fR
 .RE
 
 .sp
 .ne 2
-.mk
 .na
 \fB\fB:LIBCALLS\fR\fR
 .ad
 .RS 14n
-.rt  
 \fBsetproject()\fR, \fBactiveprojects()\fR, \fBgetprojent()\fR,
 \fBsetprojent()\fR, \fBendprojent()\fR, \fBgetprojbyname()\fR,
 \fBgetprojbyid()\fR, \fBgetdefaultproj()\fR, \fBfgetprojent()\fR,
@@ -231,24 +215,20 @@ to selectively import constants and functions defined in this module:
 
 .sp
 .ne 2
-.mk
 .na
 \fB\fB:CONSTANTS\fR\fR
 .ad
 .RS 14n
-.rt  
 \fBMAXPROJID\fR, \fBPROJNAME_MAX\fR, \fBPROJF_PATH\fR, \fBPROJECT_BUFSZ\fR,
 \fBSETPROJ_ERR_TASK\fR, and \fBSETPROJ_ERR_POOL\fR
 .RE
 
 .sp
 .ne 2
-.mk
 .na
 \fB\fB:ALL\fR\fR
 .ad
 .RS 14n
-.rt  
 :SYSCALLS\fB\fR, \fB:LIBCALLS\fR, and \fB:CONSTANTS\fR
 .RE
 
@@ -260,13 +240,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