[illumos-gate merge]

commit 42b14111721da2ebd5159e7b45012a3eb0e3384c
    8648 Fix range locking in ZIL commit codepath
commit bd9d3f904625846bdc61af8897a1072029c7aeb7
    8661 remove "zil-cw2" dtrace probe
commit 2840dce1a029098fb784afd951d5f98089f850d8
    8600 ZFS channel programs - snapshot
commit 000cce6b6fad4a8b0eecef6e1251f6aca1719c55
    8592 ZFS channel programs - rollback
commit 1c18e8fbd8db41a9fb39bd3ef7a18ee71ece20da
    8502 illumos#7955 broke delegated datasets when libshare is not present
commit 5f82aa32fbc5dc2c59bca6ff315f44a4c4c9ea86
    8595 sys/ccompile.h: add __aligned and __packed
    8596 iwn: remove local __packed
    8597 grub: use __aligned from ccompile.h
commit d042c5a26452797afc4fe8c2ceddebff94d88745
    8591 Man pages contain various errors

1 files changed, 8 insertions, 8 deletions

diff --git a/usr/src/man/man3m/clog.3m b/usr/src/man/man3m/clog.3m
index f11cc044a5..c999d5c435 100644
--- a/usr/src/man/man3m/clog.3m
+++ b/usr/src/man/man3m/clog.3m
@@ -1,14 +1,14 @@
 '\" te
 .\" Copyright (c) 2001, the Institute of Electrical and Electronics Engineers, Inc. and The Open Group. All Rights Reserved.
 .\" Portions Copyright (c) 2006, Sun Microsystems, Inc. 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 clog 3M "12 Jul 2006" "SunOS 5.11" "Mathematical Library Functions"
+.TH CLOG 3M "Jul 12, 2006" "SunOS 5.11" "Mathematical Library Functions"
 .SH NAME
 clog, clogf, clogl \- complex natural logarithm functions
 .SH SYNOPSIS
@@ -53,15 +53,15 @@ 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) 
+tab(	) box;
+cw(2.75i) |cw(2.75i)
+lw(2.75i) |lw(2.75i)
 .
-ATTRIBUTE TYPEATTRIBUTE VALUE
+ATTRIBUTE TYPE	ATTRIBUTE VALUE
 _
-Interface StabilityStandard
+Interface Stability	Standard
 _
-MT-LevelMT-Safe
+MT-Level	MT-Safe
 .TE
 
 .SH SEE ALSO