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

diff --git a/usr/src/man/man2/vfork.2 b/usr/src/man/man2/vfork.2
index c93b666fc5..beebb68987 100644
--- a/usr/src/man/man2/vfork.2
+++ b/usr/src/man/man2/vfork.2
@@ -2,7 +2,7 @@
 .\" Copyright (c) 2004, Sun Microsystems, Inc.  All Rights Reserved.
 .\" Copyright 1989 AT&T.
 .\" Copyright (c) 1980 Regents of the University of California.  All rights reserved.  The Berkeley software License Agreement  specifies the terms and conditions for redistribution.
-.TH vfork 2 "13 Dec 2006" "SunOS 5.11" "System Calls"
+.TH VFORK 2 "Dec 13, 2006"
 .SH NAME
 vfork, vforkx \- spawn new process in a virtual memory efficient way
 .SH SYNOPSIS
@@ -99,12 +99,10 @@ process is created, and \fBerrno\fR is set to indicate the error.
 The \fBvfork()\fR and \fBvforkx()\fR functions will fail if:
 .sp
 .ne 2
-.mk
 .na
 \fB\fBEAGAIN\fR\fR
 .ad
 .RS 10n
-.rt  
 The system-imposed limit on the total number of processes under execution
 (either system-quality or by a single user) would be exceeded. This limit is
 determined when the system is generated.
@@ -112,12 +110,10 @@ determined when the system is generated.
 
 .sp
 .ne 2
-.mk
 .na
 \fB\fBENOMEM\fR\fR
 .ad
 .RS 10n
-.rt  
 There is insufficient swap space for the new process.
 .RE
 
@@ -126,12 +122,10 @@ There is insufficient swap space for the new process.
 The \fBvforkx()\fR function will fail if:
 .sp
 .ne 2
-.mk
 .na
 \fB\fBEINVAL\fR\fR
 .ad
 .RS 10n
-.rt  
 The \fIflags\fR argument is invalid.
 .RE
 
@@ -143,15 +137,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 StabilityObsolete
+Interface Stability	Obsolete
 _
-MT-LevelUnsafe
+MT-Level	Unsafe
 .TE
 
 .SH SEE ALSO