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

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

1 files changed, 39 insertions, 44 deletions

diff --git a/usr/src/man/man3c/sysconf.3c b/usr/src/man/man3c/sysconf.3c
index a7ae5242bb..a200a3ac6c 100644
--- a/usr/src/man/man3c/sysconf.3c
+++ b/usr/src/man/man3c/sysconf.3c
@@ -2,14 +2,14 @@
 .\" Copyright (c) 2008, Sun Microsystems, Inc.  All Rights Reserved.
 .\" Portions Copyright (c) 1992, X/Open Company Limited.  All Rights Reserved.
 .\" Copyright 1989 AT&T
-.\" 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 sysconf 3C "26 Mar 2008" "SunOS 5.11" "Standard C Library Functions"
+.TH SYSCONF 3C "Mar 26, 2008"
 .SH NAME
 sysconf \- get configurable system variables
 .SH SYNOPSIS
@@ -110,7 +110,7 @@ _SC_CHILD_MAX           CHILD_MAX                  Max processes
                                                    allowed to a UID
 _SC_CLK_TCK             CLK_TCK                    Ticks per second
                                                    (clock_t)
-_SC_CLOCK_SELECTION     _POSIX_CLOCK_SELECTION     Supports Clock 
+_SC_CLOCK_SELECTION     _POSIX_CLOCK_SELECTION     Supports Clock
                                                    Selection option
 _SC_COLL_WEIGHTS_MAX    COLL_WEIGHTS_MAX           Max number of
                                                    weights that can be
@@ -118,7 +118,7 @@ _SC_COLL_WEIGHTS_MAX    COLL_WEIGHTS_MAX           Max number of
                                                    the LC_COLLATE order
                                                    keyword in locale
                                                    definition file
-_SC_CPUID_MAX                                      Max possible 
+_SC_CPUID_MAX                                      Max possible
                                                    processor ID
 _SC_DELAYTIMER_MAX      DELAYTIMER_MAX             Max number of timer
                                                    expiration overruns
@@ -285,17 +285,17 @@ _SC_TZNAME_MAX          TZNAME_MAX                 Max number of bytes
                                                    of a time zone
 _SC_V6_ILP32_OFF32      _POSIX_V6_ILP32_OFF32      Supports  X/Open
                                                    ILP32 w/32-bit
-                                                   offset build 
+                                                   offset build
                                                    environment
 _SC_V6_ILP32_OFFBIG     _POSIX_V6_ILP32_OFFBIG     Supports  X/Open
                                                    ILP32 w/64-bit
-                                                   offset build 
+                                                   offset build
                                                    environment
 _SC_V6_LP64_OFF64       _POSIX_V6_LP64_OFF64       Supports  X/Open
                                                    LP64 w/64-bit
-                                                   offset build 
+                                                   offset build
                                                    environment
-_SC_V6_LPBIG_OFFBIG     _POSIX_V6_LPBIG_OFFBIG     Same as 
+_SC_V6_LPBIG_OFFBIG     _POSIX_V6_LPBIG_OFFBIG     Same as
                                                    _SC_V6_LP64_OFF64
 _SC_VERSION             _POSIX_VERSION             POSIX.1 version
                                                    supported
@@ -362,31 +362,29 @@ The following options are not supported and return \(mi1:
 
 .sp
 .TS
-tab();
-lw(2.75i) lw(2.75i) 
-lw(2.75i) lw(2.75i) 
-.
-\fB_SC_2_PBS\fR\fB_POSIX2_PBS\fR
-\fB_SC_2_PBS_ACCOUNTING\fR\fB_POSIX2_PBS_ACCOUNTING\fR
-\fB_SC_2_PBS_CHECKPOINT\fR\fB_POSIX2_PBS_CHECKPOINT\fR
-\fB_SC_2_PBS_LOCATE\fR\fB_POSIX2_PBS_LOCATE\fR
-\fB_SC_2_PBS_MESSAGE\fR\fB_POSIX2_PBS_MESSAGE\fR
-\fB_SC_2_PBS_TRACK\fR\fB_POSIX2_PBS_TRACK\fR
-\fB_SC_ADVISORY_INFO\fR\fB_POSIX_ADVISORY_INFO\fR
-\fB_SC_CPUTIME\fR\fB_POSIX_CPUTIME\fR
-\fB_SC_SPORADIC_SERVER\fR\fB_POSIX_SPORADIC_SERVER\fR
-\fB_SC_SS_REPL_MAX\fR\fB_POSIX_SS_REPL_MAX\fR
-\fB_SC_THREAD_CPUTIME\fR\fB_POSIX_THREAD_CPUTIME\fR
-\fB_SC_THREAD_SPORADIC_SERVER\fR\fB_POSIX_THREAD_SPORADIC_SERVER\fR
-\fB_SC_TRACE\fR\fB_POSIX_TRACE\fR
-\fB_SC_TRACE_EVENT_FILTER\fR\fB_POSIX_TRACE_EVENT_FILTER\fR
-\fB_SC_TRACE_EVENT_NAME_MAX\fR\fB_POSIX_TRACE_EVENT_NAME_MAX\fR
-\fB_SC_TRACE_INHERIT\fR\fB_POSIX_TRACE_INHERIT\fR
-\fB_SC_TRACE_LOG\fR\fB_POSIX_TRACE_LOG\fR
-\fB_SC_TRACE_NAME_MAX\fR\fB_POSIX_TRACE_NAME_MAX\fR
-\fB_SC_TRACE_SYS_MAX\fR\fB_POSIX_TRACE_SYS_MAX\fR
-\fB_SC_TRACE_USER_EVENT_MAX\fR\fB_POSIX_TRACE_USER_EVENT_MAX\fR
-\fB_SC_TYPED_MEMORY_OBJECTS\fR\fB_POSIX_TYPED_MEMORY_OBJECTS\fR
+l l
+l l .
+\fB_SC_2_PBS\fR	\fB_POSIX2_PBS\fR
+\fB_SC_2_PBS_ACCOUNTING\fR	\fB_POSIX2_PBS_ACCOUNTING\fR
+\fB_SC_2_PBS_CHECKPOINT\fR	\fB_POSIX2_PBS_CHECKPOINT\fR
+\fB_SC_2_PBS_LOCATE\fR	\fB_POSIX2_PBS_LOCATE\fR
+\fB_SC_2_PBS_MESSAGE\fR	\fB_POSIX2_PBS_MESSAGE\fR
+\fB_SC_2_PBS_TRACK\fR	\fB_POSIX2_PBS_TRACK\fR
+\fB_SC_ADVISORY_INFO\fR	\fB_POSIX_ADVISORY_INFO\fR
+\fB_SC_CPUTIME\fR	\fB_POSIX_CPUTIME\fR
+\fB_SC_SPORADIC_SERVER\fR	\fB_POSIX_SPORADIC_SERVER\fR
+\fB_SC_SS_REPL_MAX\fR	\fB_POSIX_SS_REPL_MAX\fR
+\fB_SC_THREAD_CPUTIME\fR	\fB_POSIX_THREAD_CPUTIME\fR
+\fB_SC_THREAD_SPORADIC_SERVER\fR	\fB_POSIX_THREAD_SPORADIC_SERVER\fR
+\fB_SC_TRACE\fR	\fB_POSIX_TRACE\fR
+\fB_SC_TRACE_EVENT_FILTER\fR	\fB_POSIX_TRACE_EVENT_FILTER\fR
+\fB_SC_TRACE_EVENT_NAME_MAX\fR	\fB_POSIX_TRACE_EVENT_NAME_MAX\fR
+\fB_SC_TRACE_INHERIT\fR	\fB_POSIX_TRACE_INHERIT\fR
+\fB_SC_TRACE_LOG\fR	\fB_POSIX_TRACE_LOG\fR
+\fB_SC_TRACE_NAME_MAX\fR	\fB_POSIX_TRACE_NAME_MAX\fR
+\fB_SC_TRACE_SYS_MAX\fR	\fB_POSIX_TRACE_SYS_MAX\fR
+\fB_SC_TRACE_USER_EVENT_MAX\fR	\fB_POSIX_TRACE_USER_EVENT_MAX\fR
+\fB_SC_TYPED_MEMORY_OBJECTS\fR	\fB_POSIX_TYPED_MEMORY_OBJECTS\fR
 .TE
 
 .SH RETURN VALUES
@@ -445,12 +443,10 @@ _SC_SPLIT_CACHE
 The \fBsysconf()\fR function will fail if:
 .sp
 .ne 2
-.mk
 .na
 \fB\fBEINVAL\fR\fR
 .ad
 .RS 10n
-.rt  
 The value of the \fIname\fR argument is invalid.
 .RE
 
@@ -462,19 +458,18 @@ 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
 _
-ArchitectureSPARC and x86
+Architecture	SPARC and x86
 _
-Interface StabilityCommitted
+Interface Stability	Committed
 _
-MT-LevelMT-Safe, Async-Signal-Safe
+MT-Level	MT-Safe, Async-Signal-Safe
 _
-StandardSee \fBstandards\fR(5).
+Standard	See \fBstandards\fR(5).
 .TE
 
 .SH SEE ALSO