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

diff --git a/usr/src/man/man3mail/maillock.3mail b/usr/src/man/man3mail/maillock.3mail
index e2cfa4ff99..70cc1ece75 100644
--- a/usr/src/man/man3mail/maillock.3mail
+++ b/usr/src/man/man3mail/maillock.3mail
@@ -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 maillock 3MAIL "29 Mar 1999" "SunOS 5.11" "User Mailbox Library Functions"
+.TH MAILLOCK 3MAIL "Mar 29, 1999"
 .SH NAME
 maillock, mailunlock, touchlock \- functions to manage lockfile(s) for user's
 mailbox
@@ -70,23 +70,19 @@ returns \fB\(mi1\fR\&.
 .SH FILES
 .sp
 .ne 2
-.mk
 .na
 \fB\fB/var/mail/*\fR\fR
 .ad
 .RS 20n
-.rt  
 user mailbox files
 .RE
 
 .sp
 .ne 2
-.mk
 .na
 \fB\fB/var/mail/*.lock\fR\fR
 .ad
 .RS 20n
-.rt  
 user mailbox lockfiles
 .RE
 
@@ -98,13 +94,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
 _
-MT-LevelUnsafe
+MT-Level	Unsafe
 .TE
 
 .SH SEE ALSO