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

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

1 files changed, 8 insertions, 57 deletions

diff --git a/usr/src/man/man3c/fopen.3c b/usr/src/man/man3c/fopen.3c
index df3a9ad119..ef177a4264 100644
--- a/usr/src/man/man3c/fopen.3c
+++ b/usr/src/man/man3c/fopen.3c
@@ -2,14 +2,14 @@
 .\" Copyright 1989 AT&T.
 .\" Copyright (c) 2006, Sun Microsystems, Inc.  All Rights Reserved.
 .\" Portions Copyright (c) 1992, X/Open Company Limited.  All Rights Reserved.
-.\" Sun Microsystems, Inc. gratefully acknowledges The Open Group for permission to reproduce portions of its copyrighted documentation. Original documentation from The Open Group can be obtained online at 
+.\" Sun Microsystems, Inc. gratefully acknowledges The Open Group for permission to reproduce portions of its copyrighted documentation. Original documentation from The Open Group can be obtained online at
 .\" http://www.opengroup.org/bookstore/.
 .\" The Institute of Electrical and Electronics Engineers and The Open Group, have given us permission to reprint portions of their documentation. In the following statement, the phrase "this text" refers to portions of the system documentation. Portions of this text are reprinted and reproduced in electronic form in the Sun OS Reference Manual, from IEEE Std 1003.1, 2004 Edition, Standard for Information Technology -- Portable Operating System Interface (POSIX), The Open Group Base Specifications Issue 6, Copyright (C) 2001-2004 by the Institute of Electrical and Electronics Engineers, Inc and The Open Group. In the event of any discrepancy between these versions and the original IEEE and The Open Group Standard, the original IEEE and The Open Group Standard is the referee document. The original Standard can be obtained online at http://www.opengroup.org/unix/online.html.
 .\"  This notice shall appear on any product containing this material.
 .\" 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 fopen 3C "18 Apr 2006" "SunOS 5.11" "Standard C Library Functions"
+.TH FOPEN 3C "Apr 18, 2006"
 .SH NAME
 fopen \- open a stream
 .SH SYNOPSIS
@@ -31,67 +31,55 @@ The argument \fImode\fR points to a string beginning with one of the following
 sequences:
 .sp
 .ne 2
-.mk
 .na
 \fB\fBr\fR or \fBrb\fR\fR
 .ad
 .RS 20n
-.rt  
 Open file for reading.
 .RE
 
 .sp
 .ne 2
-.mk
 .na
 \fB\fBw\fR or \fBwb\fR\fR
 .ad
 .RS 20n
-.rt  
 Truncate to  zero  length or create file for writing.
 .RE
 
 .sp
 .ne 2
-.mk
 .na
 \fB\fBa\fR or \fBab\fR\fR
 .ad
 .RS 20n
-.rt  
 Append; open or create file for writing at end-of-file.
 .RE
 
 .sp
 .ne 2
-.mk
 .na
 \fB\fBr+\fR or \fBrb+\fR or \fBr+b\fR\fR
 .ad
 .RS 20n
-.rt  
 Open file for update (reading and writing).
 .RE
 
 .sp
 .ne 2
-.mk
 .na
 \fB\fBw+\fR or \fBwb+\fR or \fBw+b\fR\fR
 .ad
 .RS 20n
-.rt  
 Truncate to zero length or create file for update.
 .RE
 
 .sp
 .ne 2
-.mk
 .na
 \fB\fBa+\fR or \fBab+\fR or \fBa+b\fR\fR
 .ad
 .RS 20n
-.rt  
 Append; open or create file for update, writing at end-of-file.
 .RE
 
@@ -175,12 +163,10 @@ free \fBstdio\fR streams.
 The \fBfopen()\fR function will fail if:
 .sp
 .ne 2
-.mk
 .na
 \fB\fBEACCES\fR\fR
 .ad
 .RS 16n
-.rt  
 Search permission is denied on a component of the path prefix, or the file
 exists and the permissions specified by \fImode\fR are denied, or the file does
 not exist and write permission is denied for the parent directory of the file
@@ -189,139 +175,115 @@ to be created.
 
 .sp
 .ne 2
-.mk
 .na
 \fB\fBEINTR\fR\fR
 .ad
 .RS 16n
-.rt  
 A signal was caught during the execution of \fBfopen()\fR.
 .RE
 
 .sp
 .ne 2
-.mk
 .na
 \fB\fBEISDIR\fR\fR
 .ad
 .RS 16n
-.rt  
 The named file is a directory and \fImode\fR requires write access.
 .RE
 
 .sp
 .ne 2
-.mk
 .na
 \fB\fBELOOP\fR\fR
 .ad
 .RS 16n
-.rt  
 Too many symbolic links were encountered in resolving \fIpath\fR.
 .RE
 
 .sp
 .ne 2
-.mk
 .na
 \fB\fBEMFILE\fR\fR
 .ad
 .RS 16n
-.rt  
 There are {\fBOPEN_MAX\fR} file descriptors currently open in the calling
 process.
 .RE
 
 .sp
 .ne 2
-.mk
 .na
 \fB\fBENAMETOOLONG\fR\fR
 .ad
 .RS 16n
-.rt  
 The length of the \fIfilename\fR exceeds \fIPATH_MAX\fR or a pathname component
 is longer than \fINAME_MAX\fR.
 .RE
 
 .sp
 .ne 2
-.mk
 .na
 \fB\fBENFILE\fR\fR
 .ad
 .RS 16n
-.rt  
 The maximum allowable number of files is currently open in the system.
 .RE
 
 .sp
 .ne 2
-.mk
 .na
 \fB\fBENOENT\fR\fR
 .ad
 .RS 16n
-.rt  
 A component of \fIfilename\fR does not name an existing file or \fIfilename\fR
 is an empty string.
 .RE
 
 .sp
 .ne 2
-.mk
 .na
 \fB\fBENOSPC\fR\fR
 .ad
 .RS 16n
-.rt  
 The directory or file system that would contain the new file cannot be
 expanded, the file does not exist, and it was to be created.
 .RE
 
 .sp
 .ne 2
-.mk
 .na
 \fB\fBENOTDIR\fR\fR
 .ad
 .RS 16n
-.rt  
 A component of the path prefix is not a directory.
 .RE
 
 .sp
 .ne 2
-.mk
 .na
 \fB\fBENXIO\fR\fR
 .ad
 .RS 16n
-.rt  
 The named file is a character special or block special file, and the device
 associated with this special file does not exist.
 .RE
 
 .sp
 .ne 2
-.mk
 .na
 \fB\fBEOVERFLOW\fR\fR
 .ad
 .RS 16n
-.rt  
 The current value of the file position cannot be represented correctly in an
 object of type \fBfpos_t\fR.
 .RE
 
 .sp
 .ne 2
-.mk
 .na
 \fB\fBEROFS\fR\fR
 .ad
 .RS 16n
-.rt  
 The named file resides on a read-only file system and \fImode\fR requires write
 access.
 .RE
@@ -331,23 +293,19 @@ access.
 The \fBfopen()\fR function may fail if:
 .sp
 .ne 2
-.mk
 .na
 \fB\fBEINVAL\fR\fR
 .ad
 .RS 16n
-.rt  
 The value of the \fImode\fR argument is not valid.
 .RE
 
 .sp
 .ne 2
-.mk
 .na
 \fB\fBEMFILE\fR\fR
 .ad
 .RS 16n
-.rt  
 {\fBFOPEN_MAX\fR} streams are currently open in the calling process.
 .sp
 {\fBSTREAM_MAX\fR} streams are currently open in the calling process.
@@ -355,35 +313,29 @@ The value of the \fImode\fR argument is not valid.
 
 .sp
 .ne 2
-.mk
 .na
 \fB\fBENAMETOOLONG\fR\fR
 .ad
 .RS 16n
-.rt  
 Pathname resolution of a symbolic link produced an intermediate result whose
 length exceeds {\fBPATH_MAX\fR}.
 .RE
 
 .sp
 .ne 2
-.mk
 .na
 \fB\fBENOMEM\fR\fR
 .ad
 .RS 16n
-.rt  
 Insufficient storage space is available.
 .RE
 
 .sp
 .ne 2
-.mk
 .na
 \fB\fBETXTBSY\fR\fR
 .ad
 .RS 16n
-.rt  
 The file is a pure procedure (shared text) file that is being executed and
 \fImode\fR requires write access.
 .RE
@@ -421,15 +373,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 StabilitySee below.
+Interface Stability	See below.
 _
-MT-LevelMT-Safe
+MT-Level	MT-Safe
 .TE
 
 .sp