--- sendmail-8.12.9/mail.local/mail.local.8.orig	Mon Oct 20 22:26:51 2003
+++ sendmail-8.12.9/mail.local/mail.local.8	Sat Jan 11 22:34:29 2014
@@ -33,8 +33,32 @@
 .I user
 must be a valid user name.
 .PP
+Individual mail messages in the mailbox are delimited by an empty
+line followed by a line beginning with the string ``From ''.
+A line containing the string ``From '', the sender's name and a time stamp
+is prepended to each delivered mail message.
+A blank line is appended to each message.
+A greater-than character (``>'') is prepended to any line in the message
+which could be mistaken for a ``From '' delimiter line
+(that is,
+a line beginning with the five characters
+``From '' following a blank line).
+.PP
+The mail files are exclusively locked with 
+maillock(3MAIL) 
+while mail is appended, 
+and a
+.B user.lock
+file also is created while the mailbox is locked 
+for compatibility with older MUAs.
+.PP
+If the ``biff'' service is returned by 
+getservbyname(3SOCKET), 
+the biff server is notified of delivered mail.
+
+.SH OPTIONS
 The options are as follows:
-.TP 1i
+.TP
 .B \-7
 Do not advertise 8BITMIME support in LMTP mode.
 .TP 
@@ -87,61 +111,44 @@
 .BI \-n
 Specify that the domain part of recipient addresses in LMTP mode
 should not be stripped.
-.PP
-Individual mail messages in the mailbox are delimited by an empty
-line followed by a line beginning with the string ``From ''.
-A line containing the string ``From '', the sender's name and a time stamp
-is prepended to each delivered mail message.
-A blank line is appended to each message.
-A greater-than character (``>'') is prepended to any line in the message
-which could be mistaken for a ``From '' delimiter line
-(that is,
-a line beginning with the five characters
-``From '' following a blank line).
-.PP
-The mail files are exclusively locked with 
-flock(2) 
-while mail is appended, 
-and a
-.B user.lock
-file also is created while the mailbox is locked 
-for compatibility with older MUAs.
-.PP
-If the ``biff'' service is returned by 
-getservbyname(3), 
-the biff server is notified of delivered mail.
-.PP
-The
-.B mail.local
-utility exits 0 on success, and >0 if an error occurs.
+
 .SH ENVIRONMENT
-.IP TZ
+.TP
+\fBTZ\fR
 Used to set the appropriate time zone on the timestamp.
+
+.SH EXIT STATUS
+.TP
+\fB0\fR
+Successful completion.
+
+.TP
+\fB>0\fR
+An error occurred.
+
 .SH FILES
-.PD 0.2v
 .TP 2.2i
-/tmp/local.XXXXXX
+\fB/tmp/local.\fR\fIXXXXXX\fR
 temporary files
 .TP
-/var/mail/user
+\fB/var/mail/\fR\fIuser\fR
 user's default mailbox directory
 .TP 
-/var/mail/user.lock
+\fB/var/mail/\fR\fIuser\fR\fB.lock\fR
 lock file for a user's default mailbox
-.PD
+
 .SH SEE ALSO
-mail(1), 
-xsend(1), 
-flock(2), 
-getservbyname(3), 
-comsat(8), 
-sendmail(8)
-.SH WARNING
+.LP
+\fBmail\fR(1), \fBcomsat\fR(8), \fBsendmail\fR(8),
+\fBgetservbyname\fR(3SOCKET), \fBmaillock\fR(3MAIL)
+
+.SH NOTES
 .B mail.local
 escapes only "^From " lines that follow an empty line.
 If all lines starting with "From " should be escaped,
 use the 'E' flag for the local mailer in the
 sendmail.cf file.
+
 .SH HISTORY
 A superset of
 .B mail.local
@@ -148,5 +155,4 @@
 (handling mailbox reading as well as mail delivery)
 appeared in 
 Version 7 AT&T UNIX 
-as the program
-.BR mail .
+as the program \fBmail\fR.